Merge branch 'master_pay' into dev

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/BaseOrder.java

@@ -293,4 +293,9 @@ public class BaseOrder implements Serializable {
 	@ApiModelProperty(value = "促成人联系方式")
 	@Column(name = "facilitate_phone")
 	String facilitatePhone;
+
+	//支付类型
+	@ApiModelProperty(value = "支付方式")
+	@Column(name = "pay_way")
+	private Integer payWay;
 }

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/pay/NotifyUrlDTO.java

@@ -20,4 +20,8 @@ public class NotifyUrlDTO {
     //支付类型
     @ApiModelProperty(value = "支付类型")
     private Integer type;
+
+    //支付类型
+    @ApiModelProperty(value = "支付方式")
+    private Integer payWay;
 }
\ No newline at end of file

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java

@@ -563,7 +563,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
      * @param tradeNo
      */
     @Transactional
-    public void payNotifyHandle(String orderNo, String tradeNo, Integer type) {
+    public void payNotifyHandle(String orderNo, String tradeNo, Integer type, Integer payWay) {
         OrderRentVehicleDetail orvd = new OrderRentVehicleDetail();
         OrderTourDetail otd = new OrderTourDetail();
         OrderMemberDetail omd = new OrderMemberDetail();
@@ -578,6 +578,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
                 setHasPay(SYS_TRUE);
                 setPayTime(System.currentTimeMillis());
                 setPayOrigin(type);
+                setPayWay(payWay);
                 setVersion(baseOrder.getVersion());
             }};
 

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BaseOrderController.java

@@ -283,7 +283,7 @@ public class BaseOrderController extends CommonBaseController implements UserRes
     public ObjectRestResponse notifyUrl(NotifyUrlDTO dto) {
         //判断是否成功，并且订单是未支付状态，则添加支付编号和修改状态
         if (StrUtil.isNotBlank(dto.getOrderNo())) {
-            baseOrderBiz.payNotifyHandle(dto.getOrderNo(), dto.getTradeNo(), dto.getType());
+            baseOrderBiz.payNotifyHandle(dto.getOrderNo(), dto.getTradeNo(), dto.getType(), dto.getPayWay());
         } else {
             log.error(" exception notifyUrl : " + JSONUtil.toJsonStr(dto));
         }