Merge branch 'dev' into 'mp-server-test'

Dev

See merge request quanshu/mp-server!1046

mp-service/src/main/java/com/qs/mp/channel/domain/ChannelBankCard.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import java.util.Date;
 import lombok.Data;
@@ -15,64 +17,79 @@ import lombok.Data;
  */
 @TableName("mp_channel_bank_card")
 @Data
+@ApiModel("渠道银行卡实体类")
 public class ChannelBankCard implements Serializable {
 
   private static final long serialVersionUID = 1L;
 
+  @ApiModelProperty("id")
   @TableId(value = "id" , type = IdType.AUTO)
   private Long id;
 
   /**
    * 渠道id
    */
+  @ApiModelProperty("渠道id")
   @TableField("channel_id")
   private Long channelId;
 
   /**
    * 持卡人
    */
+  @ApiModelProperty("持卡人名字")
   @TableField("user_name")
   private String userName;
 
+  @ApiModelProperty("身份证号")
+  @TableField("id_card")
+  private String idCard;
+
   /**
    * 卡号
    */
+  @ApiModelProperty("卡号")
   @TableField("card_no")
   private String cardNo;
 
   /**
    * 银行卡所属银行
    */
+  @ApiModelProperty("所属银行")
   @TableField("bank_name")
   private String bankName;
 
   /**
    * 开户行
    */
+  @ApiModelProperty("开户行")
   @TableField("branch_name")
   private String branchName;
 
   /**
    * 预留手机号码
    */
+  @ApiModelProperty("预留手机号")
   @TableField("mobile")
   private String mobile;
 
   /**
    * 1默认
    */
+  @ApiModelProperty("1默认卡")
   @TableField("default_card")
   private Integer defaultCard;
 
   /**
    * 添加时间
    */
+  @ApiModelProperty("创建时间")
   @TableField("create_time")
   private Date createTime;
 
   /**
    * 修改时间
    */
+  @ApiModelProperty("更新时间")
   @TableField("update_time")
   private Date updateTime;
 

mp-service/src/main/java/com/qs/mp/pay/service/impl/WalletServiceImpl.java

@@ -202,38 +202,41 @@ public class WalletServiceImpl implements IWalletService {
       throw new ServiceException("支付发起签名失败");
     }
 
-    String result = OkHttpUtil.post("https://openapi.ysepay.com/gateway.do", params);
-
-    // 保存调用记录
-    YsCallLog ysCallLog = new YsCallLog();
-    ysCallLog.setBizId(orderId);
-    ysCallLog.setBizType(YsCallBizTypeEnum.ORDER_PAY);
-    ysCallLog.setInterfaceId(YsPayMethodConstants.H5_PAY_METHOD);
-    ysCallLog.setReqJson(JSONObject.toJSONString(params));
-    ysCallLog.setResJson(result);
-    ysCallLogService.save(ysCallLog);
-
-    //保存订单记录
-    PayOrder payOrder = new PayOrder();
-    payOrder.setOrderId(orderId);
-    payOrder.setBizType(bizType);
-    payOrder.setBizId(bizId);
-    payOrder.setTradeNo(tradeNo);
-    payOrder.setOrderTime(DateUtils.getTime());
-    payOrder.setPayResource("3"); // 支付宝直连
-    payOrder.setTransTypeCode("1020"); // 支付宝小程序
-    payOrder.setTransactionAmount(money);
-    payOrder.setOrderRemark(orderRemark);
-    payOrder.setOrderName(orderRemark);
-    payOrder.setOrderStatus(PayOrderStatusEnum.WAIT.getValue());
-    boolean ret = payOrderService.save(payOrder);
-    if (!ret) {
-      LogUtil.error(logger, "支付订单数据保存失败.");
-      throw new ServiceException("支付订单保存失败");
-    }
-
-    JSONObject data = new JSONObject();
-    data.put("payUrl", result);
+//    String result = OkHttpUtil.post("https://openapi.ysepay.com/gateway.do", params);
+//
+//    // 保存调用记录
+//    YsCallLog ysCallLog = new YsCallLog();
+//    ysCallLog.setBizId(orderId);
+//    ysCallLog.setBizType(YsCallBizTypeEnum.ORDER_PAY);
+//    ysCallLog.setInterfaceId(YsPayMethodConstants.H5_PAY_METHOD);
+//    ysCallLog.setReqJson(JSONObject.toJSONString(params));
+//    ysCallLog.setResJson(result);
+//    ysCallLogService.save(ysCallLog);
+//
+//    //保存订单记录
+//    PayOrder payOrder = new PayOrder();
+//    payOrder.setOrderId(orderId);
+//    payOrder.setBizType(bizType);
+//    payOrder.setBizId(bizId);
+//    payOrder.setTradeNo(tradeNo);
+//    payOrder.setOrderTime(DateUtils.getTime());
+//    payOrder.setPayResource("3"); // 支付宝直连
+//    payOrder.setTransTypeCode("1020"); // 支付宝小程序
+//    payOrder.setTransactionAmount(money);
+//    payOrder.setOrderRemark(orderRemark);
+//    payOrder.setOrderName(orderRemark);
+//    payOrder.setOrderStatus(PayOrderStatusEnum.WAIT.getValue());
+//    boolean ret = payOrderService.save(payOrder);
+//    if (!ret) {
+//      LogUtil.error(logger, "支付订单数据保存失败.");
+//      throw new ServiceException("支付订单保存失败");
+//    }
+//
+//    JSONObject data = new JSONObject();
+//    data.put("payUrl", result);
+
+
+    JSONObject data = JSONObject.parseObject(JSONObject.toJSONString(params));
     return data;
   }