Procházet zdrojové kódy

fix order

release_toaliyun_real
xiaohanzi před 4 roky
rodič
revize
6bdfac6971
3 změnil soubory, kde provedl 106 přidání a 14 odebrání
  1. +101
    -0
      mallinkAdmin/src/main/resources/db/migration/V202109070001__order.sql
  2. +5
    -6
      mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java
  3. +0
    -8
      mallinkService/src/main/java/com/iformall/service/order/entity/WxComposeOrder.java

+ 101
- 0
mallinkAdmin/src/main/resources/db/migration/V202109070001__order.sql Zobrazit soubor

@@ -922,4 +922,105 @@ update wx_order_97 set compose_order_id = 0 ,coupon_number=1;
update wx_order_98 set compose_order_id = 0 ,coupon_number=1; update wx_order_98 set compose_order_id = 0 ,coupon_number=1;
update wx_order_99 set compose_order_id = 0 ,coupon_number=1; update wx_order_99 set compose_order_id = 0 ,coupon_number=1;


update wx_pay_order_0 set compose_order = 0 ;
update wx_pay_order_1 set compose_order = 0 ;
update wx_pay_order_2 set compose_order = 0 ;
update wx_pay_order_3 set compose_order = 0 ;
update wx_pay_order_4 set compose_order = 0 ;
update wx_pay_order_5 set compose_order = 0 ;
update wx_pay_order_6 set compose_order = 0 ;
update wx_pay_order_7 set compose_order = 0 ;
update wx_pay_order_8 set compose_order = 0 ;
update wx_pay_order_9 set compose_order = 0 ;
update wx_pay_order_10 set compose_order = 0 ;
update wx_pay_order_11 set compose_order = 0 ;
update wx_pay_order_12 set compose_order = 0 ;
update wx_pay_order_13 set compose_order = 0 ;
update wx_pay_order_14 set compose_order = 0 ;
update wx_pay_order_15 set compose_order = 0 ;
update wx_pay_order_16 set compose_order = 0 ;
update wx_pay_order_17 set compose_order = 0 ;
update wx_pay_order_18 set compose_order = 0 ;
update wx_pay_order_19 set compose_order = 0 ;
update wx_pay_order_20 set compose_order = 0 ;
update wx_pay_order_21 set compose_order = 0 ;
update wx_pay_order_22 set compose_order = 0 ;
update wx_pay_order_23 set compose_order = 0 ;
update wx_pay_order_24 set compose_order = 0 ;
update wx_pay_order_25 set compose_order = 0 ;
update wx_pay_order_26 set compose_order = 0 ;
update wx_pay_order_27 set compose_order = 0 ;
update wx_pay_order_28 set compose_order = 0 ;
update wx_pay_order_29 set compose_order = 0 ;
update wx_pay_order_30 set compose_order = 0 ;
update wx_pay_order_31 set compose_order = 0 ;
update wx_pay_order_32 set compose_order = 0 ;
update wx_pay_order_33 set compose_order = 0 ;
update wx_pay_order_34 set compose_order = 0 ;
update wx_pay_order_35 set compose_order = 0 ;
update wx_pay_order_36 set compose_order = 0 ;
update wx_pay_order_37 set compose_order = 0 ;
update wx_pay_order_38 set compose_order = 0 ;
update wx_pay_order_39 set compose_order = 0 ;
update wx_pay_order_40 set compose_order = 0 ;
update wx_pay_order_41 set compose_order = 0 ;
update wx_pay_order_42 set compose_order = 0 ;
update wx_pay_order_43 set compose_order = 0 ;
update wx_pay_order_44 set compose_order = 0 ;
update wx_pay_order_45 set compose_order = 0 ;
update wx_pay_order_46 set compose_order = 0 ;
update wx_pay_order_47 set compose_order = 0 ;
update wx_pay_order_48 set compose_order = 0 ;
update wx_pay_order_49 set compose_order = 0 ;
update wx_pay_order_50 set compose_order = 0 ;
update wx_pay_order_51 set compose_order = 0 ;
update wx_pay_order_52 set compose_order = 0 ;
update wx_pay_order_53 set compose_order = 0 ;
update wx_pay_order_54 set compose_order = 0 ;
update wx_pay_order_55 set compose_order = 0 ;
update wx_pay_order_56 set compose_order = 0 ;
update wx_pay_order_57 set compose_order = 0 ;
update wx_pay_order_58 set compose_order = 0 ;
update wx_pay_order_59 set compose_order = 0 ;
update wx_pay_order_60 set compose_order = 0 ;
update wx_pay_order_61 set compose_order = 0 ;
update wx_pay_order_62 set compose_order = 0 ;
update wx_pay_order_63 set compose_order = 0 ;
update wx_pay_order_64 set compose_order = 0 ;
update wx_pay_order_65 set compose_order = 0 ;
update wx_pay_order_66 set compose_order = 0 ;
update wx_pay_order_67 set compose_order = 0 ;
update wx_pay_order_68 set compose_order = 0 ;
update wx_pay_order_69 set compose_order = 0 ;
update wx_pay_order_70 set compose_order = 0 ;
update wx_pay_order_71 set compose_order = 0 ;
update wx_pay_order_72 set compose_order = 0 ;
update wx_pay_order_73 set compose_order = 0 ;
update wx_pay_order_74 set compose_order = 0 ;
update wx_pay_order_75 set compose_order = 0 ;
update wx_pay_order_76 set compose_order = 0 ;
update wx_pay_order_77 set compose_order = 0 ;
update wx_pay_order_78 set compose_order = 0 ;
update wx_pay_order_79 set compose_order = 0 ;
update wx_pay_order_80 set compose_order = 0 ;
update wx_pay_order_81 set compose_order = 0 ;
update wx_pay_order_82 set compose_order = 0 ;
update wx_pay_order_83 set compose_order = 0 ;
update wx_pay_order_84 set compose_order = 0 ;
update wx_pay_order_85 set compose_order = 0 ;
update wx_pay_order_86 set compose_order = 0 ;
update wx_pay_order_87 set compose_order = 0 ;
update wx_pay_order_88 set compose_order = 0 ;
update wx_pay_order_89 set compose_order = 0 ;
update wx_pay_order_90 set compose_order = 0 ;
update wx_pay_order_91 set compose_order = 0 ;
update wx_pay_order_92 set compose_order = 0 ;
update wx_pay_order_93 set compose_order = 0 ;
update wx_pay_order_94 set compose_order = 0 ;
update wx_pay_order_95 set compose_order = 0 ;
update wx_pay_order_96 set compose_order = 0 ;
update wx_pay_order_97 set compose_order = 0 ;
update wx_pay_order_98 set compose_order = 0 ;
update wx_pay_order_99 set compose_order = 0 ;




+ 5
- 6
mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java Zobrazit soubor

@@ -95,12 +95,11 @@ public class WxPayOrderController extends BaseController {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "orderId不能为空"); return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "orderId不能为空");
} }
String composeOrderType = "0";
// String composeOrderType = paramMap.get("composeOrderType");
// if (StringUtils.isBlank(composeOrderType)) {
// logger.info("composeOrderType不能为空: " + paramMap.toString());
// return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "composeOrderType不能为空");
// }
String composeOrderType = paramMap.get("composeOrderType");
if (StringUtils.isBlank(composeOrderType)) {
logger.info("composeOrderType不能为空: " + paramMap.toString());
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "composeOrderType不能为空");
}
WxCUser user = getWxCUser(); WxCUser user = getWxCUser();
if (!user.basicInfoIs()) { if (!user.basicInfoIs()) {


+ 0
- 8
mallinkService/src/main/java/com/iformall/service/order/entity/WxComposeOrder.java Zobrazit soubor

@@ -22,12 +22,4 @@ public class WxComposeOrder {
private Object mainOrder;//真正的主订单对象 private Object mainOrder;//真正的主订单对象
//TODO 调试用,兼容以前的接口
private Long Id;
public Long getId() {
this.Id = this.mainOrderId;
return this.Id;
}
} }

Načítá se…
Zrušit
Uložit