Conflicts: mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xmlrelease_toaliyun_real
| @@ -187,7 +187,7 @@ public class WxOrderController extends BaseController { | |||
| return new ResultData(ErrorCode.COUPON_IS_NOT_FREE); | |||
| } | |||
| // 免费券 | |||
| order = wxOrderService.saveFreeOrderForCoupon(null,user, coupon, 1, | |||
| order = wxOrderService.saveFreeOrderForCoupon(false,null,user, coupon, 1, | |||
| orderSaveDto.getCouponChannelId(), orderSaveDto.getFormId(), null,EnumPayWay.PAY_WAY_NOT_UNPAY_CREDIT, | |||
| EnumOrderShopingType.ONLINE_PURCHASE.getCode(),null); | |||
| return new ResultData(order); | |||
| @@ -1023,4 +1023,204 @@ 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 ; | |||
| ALTER TABLE wx_coupon_order_0 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_1 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_2 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_3 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_4 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_5 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_6 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_7 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_8 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_9 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_10 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_11 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_12 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_13 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_14 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_15 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_16 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_17 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_18 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_19 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_20 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_21 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_22 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_23 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_24 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_25 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_26 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_27 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_28 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_29 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_30 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_31 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_32 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_33 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_34 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_35 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_36 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_37 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_38 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_39 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_40 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_41 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_42 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_43 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_44 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_45 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_46 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_47 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_48 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_49 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_50 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_51 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_52 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_53 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_54 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_55 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_56 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_57 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_58 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_59 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_60 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_61 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_62 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_63 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_64 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_65 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_66 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_67 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_68 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_69 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_70 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_71 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_72 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_73 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_74 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_75 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_76 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_77 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_78 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_79 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_80 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_81 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_82 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_83 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_84 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_85 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_86 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_87 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_88 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_89 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_90 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_91 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_92 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_93 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_94 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_95 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_96 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_97 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_98 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| ALTER TABLE wx_coupon_order_99 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量'; | |||
| update wx_coupon_order_0 set coupon_number = 1; | |||
| update wx_coupon_order_1 set coupon_number = 1; | |||
| update wx_coupon_order_2 set coupon_number = 1; | |||
| update wx_coupon_order_3 set coupon_number = 1; | |||
| update wx_coupon_order_4 set coupon_number = 1; | |||
| update wx_coupon_order_5 set coupon_number = 1; | |||
| update wx_coupon_order_6 set coupon_number = 1; | |||
| update wx_coupon_order_7 set coupon_number = 1; | |||
| update wx_coupon_order_8 set coupon_number = 1; | |||
| update wx_coupon_order_9 set coupon_number = 1; | |||
| update wx_coupon_order_10 set coupon_number = 1; | |||
| update wx_coupon_order_11 set coupon_number = 1; | |||
| update wx_coupon_order_12 set coupon_number = 1; | |||
| update wx_coupon_order_13 set coupon_number = 1; | |||
| update wx_coupon_order_14 set coupon_number = 1; | |||
| update wx_coupon_order_15 set coupon_number = 1; | |||
| update wx_coupon_order_16 set coupon_number = 1; | |||
| update wx_coupon_order_17 set coupon_number = 1; | |||
| update wx_coupon_order_18 set coupon_number = 1; | |||
| update wx_coupon_order_19 set coupon_number = 1; | |||
| update wx_coupon_order_20 set coupon_number = 1; | |||
| update wx_coupon_order_21 set coupon_number = 1; | |||
| update wx_coupon_order_22 set coupon_number = 1; | |||
| update wx_coupon_order_23 set coupon_number = 1; | |||
| update wx_coupon_order_24 set coupon_number = 1; | |||
| update wx_coupon_order_25 set coupon_number = 1; | |||
| update wx_coupon_order_26 set coupon_number = 1; | |||
| update wx_coupon_order_27 set coupon_number = 1; | |||
| update wx_coupon_order_28 set coupon_number = 1; | |||
| update wx_coupon_order_29 set coupon_number = 1; | |||
| update wx_coupon_order_30 set coupon_number = 1; | |||
| update wx_coupon_order_31 set coupon_number = 1; | |||
| update wx_coupon_order_32 set coupon_number = 1; | |||
| update wx_coupon_order_33 set coupon_number = 1; | |||
| update wx_coupon_order_34 set coupon_number = 1; | |||
| update wx_coupon_order_35 set coupon_number = 1; | |||
| update wx_coupon_order_36 set coupon_number = 1; | |||
| update wx_coupon_order_37 set coupon_number = 1; | |||
| update wx_coupon_order_38 set coupon_number = 1; | |||
| update wx_coupon_order_39 set coupon_number = 1; | |||
| update wx_coupon_order_40 set coupon_number = 1; | |||
| update wx_coupon_order_41 set coupon_number = 1; | |||
| update wx_coupon_order_42 set coupon_number = 1; | |||
| update wx_coupon_order_43 set coupon_number = 1; | |||
| update wx_coupon_order_44 set coupon_number = 1; | |||
| update wx_coupon_order_45 set coupon_number = 1; | |||
| update wx_coupon_order_46 set coupon_number = 1; | |||
| update wx_coupon_order_47 set coupon_number = 1; | |||
| update wx_coupon_order_48 set coupon_number = 1; | |||
| update wx_coupon_order_49 set coupon_number = 1; | |||
| update wx_coupon_order_50 set coupon_number = 1; | |||
| update wx_coupon_order_51 set coupon_number = 1; | |||
| update wx_coupon_order_52 set coupon_number = 1; | |||
| update wx_coupon_order_53 set coupon_number = 1; | |||
| update wx_coupon_order_54 set coupon_number = 1; | |||
| update wx_coupon_order_55 set coupon_number = 1; | |||
| update wx_coupon_order_56 set coupon_number = 1; | |||
| update wx_coupon_order_57 set coupon_number = 1; | |||
| update wx_coupon_order_58 set coupon_number = 1; | |||
| update wx_coupon_order_59 set coupon_number = 1; | |||
| update wx_coupon_order_60 set coupon_number = 1; | |||
| update wx_coupon_order_61 set coupon_number = 1; | |||
| update wx_coupon_order_62 set coupon_number = 1; | |||
| update wx_coupon_order_63 set coupon_number = 1; | |||
| update wx_coupon_order_64 set coupon_number = 1; | |||
| update wx_coupon_order_65 set coupon_number = 1; | |||
| update wx_coupon_order_66 set coupon_number = 1; | |||
| update wx_coupon_order_67 set coupon_number = 1; | |||
| update wx_coupon_order_68 set coupon_number = 1; | |||
| update wx_coupon_order_69 set coupon_number = 1; | |||
| update wx_coupon_order_70 set coupon_number = 1; | |||
| update wx_coupon_order_71 set coupon_number = 1; | |||
| update wx_coupon_order_72 set coupon_number = 1; | |||
| update wx_coupon_order_73 set coupon_number = 1; | |||
| update wx_coupon_order_74 set coupon_number = 1; | |||
| update wx_coupon_order_75 set coupon_number = 1; | |||
| update wx_coupon_order_76 set coupon_number = 1; | |||
| update wx_coupon_order_77 set coupon_number = 1; | |||
| update wx_coupon_order_78 set coupon_number = 1; | |||
| update wx_coupon_order_79 set coupon_number = 1; | |||
| update wx_coupon_order_80 set coupon_number = 1; | |||
| update wx_coupon_order_81 set coupon_number = 1; | |||
| update wx_coupon_order_82 set coupon_number = 1; | |||
| update wx_coupon_order_83 set coupon_number = 1; | |||
| update wx_coupon_order_84 set coupon_number = 1; | |||
| update wx_coupon_order_85 set coupon_number = 1; | |||
| update wx_coupon_order_86 set coupon_number = 1; | |||
| update wx_coupon_order_87 set coupon_number = 1; | |||
| update wx_coupon_order_88 set coupon_number = 1; | |||
| update wx_coupon_order_89 set coupon_number = 1; | |||
| update wx_coupon_order_90 set coupon_number = 1; | |||
| update wx_coupon_order_91 set coupon_number = 1; | |||
| update wx_coupon_order_92 set coupon_number = 1; | |||
| update wx_coupon_order_93 set coupon_number = 1; | |||
| update wx_coupon_order_94 set coupon_number = 1; | |||
| update wx_coupon_order_95 set coupon_number = 1; | |||
| update wx_coupon_order_96 set coupon_number = 1; | |||
| update wx_coupon_order_97 set coupon_number = 1; | |||
| update wx_coupon_order_98 set coupon_number = 1; | |||
| update wx_coupon_order_99 set coupon_number = 1; | |||
| @@ -97,7 +97,7 @@ public class WxCouponPasswordController extends BaseController { | |||
| // 3. 领取free coupon | |||
| try { | |||
| WxOrder order = orderService.saveFreeOrderForCoupon(null,member, coupon, 1, | |||
| WxOrder order = orderService.saveFreeOrderForCoupon(false,null,member, coupon, 1, | |||
| null, formId, couponPassword.getId(),payWay, | |||
| EnumOrderShopingType.ONLINE_PURCHASE.getCode(),null); | |||
| } catch (MallinkException e) { | |||
| @@ -73,7 +73,7 @@ public class WxOrderController extends BaseController { | |||
| return new ResultData(Result.ERROR,e.getMessage()); | |||
| } | |||
| return wxOrderService.composeSaveOrder(EnumComposeOrder.PACKAGECOUPON,orderSaveDto,memberId,EnumPayWay.PAY_WAY_WECHAT,getTenantInfo()); | |||
| return wxOrderService.composeSaveOrder(false,EnumComposeOrder.PACKAGECOUPON,orderSaveDto,memberId,EnumPayWay.PAY_WAY_WECHAT,getTenantInfo()); | |||
| } | |||
| @ApiOperation(value = "商品购物车组合下单", notes = "[{\"signleOrder\":{\"couponChannelId\":\"String\",\"couponId\":\"String\",\"press\":\"String\",\"orderGroupId\":\"String\",\"formId\":\"String\"},\"count\":8},]") | |||
| @@ -85,7 +85,7 @@ public class WxOrderController extends BaseController { | |||
| } catch (Exception e) { | |||
| return new ResultData(Result.ERROR,e.getMessage()); | |||
| } | |||
| return wxOrderService.composeSaveOrder(EnumComposeOrder.MULITY_NUMBER_ORDER_BATCH,orderSaveDto,memberId,EnumPayWay.PAY_WAY_WECHAT,getTenantInfo()); | |||
| return wxOrderService.composeSaveOrder(true,EnumComposeOrder.MULITY_NUMBER_ORDER_BATCH,orderSaveDto,memberId,EnumPayWay.PAY_WAY_WECHAT,getTenantInfo()); | |||
| } | |||
| @ApiOperation(value = "券购物车组合下单", notes = "[{\"signleOrder\":{\"couponChannelId\":\"String\",\"couponId\":\"String\",\"press\":\"String\",\"orderGroupId\":\"String\",\"formId\":\"String\"},\"count\":8},]") | |||
| @@ -97,7 +97,7 @@ public class WxOrderController extends BaseController { | |||
| } catch (Exception e) { | |||
| return new ResultData(Result.ERROR,e.getMessage()); | |||
| } | |||
| return wxOrderService.composeSaveOrder(EnumComposeOrder.ONE_NUMBER_ORDER_BATCH,orderSaveDto,memberId,EnumPayWay.PAY_WAY_WECHAT,getTenantInfo()); | |||
| return wxOrderService.composeSaveOrder(false,EnumComposeOrder.ONE_NUMBER_ORDER_BATCH,orderSaveDto,memberId,EnumPayWay.PAY_WAY_WECHAT,getTenantInfo()); | |||
| } | |||
| @ApiOperation(value = "单个券单个订单,卡(分账导致无法批量下单)、拼团,砍价用", notes = "{\"couponChannelId\":\"String\",\"couponId\":\"String\",\"press\":\"String\",\"orderGroupId\":\"String\",\"formId\":\"String\"}") | |||
| @@ -115,7 +115,7 @@ public class WxOrderController extends BaseController { | |||
| dto.setSignleOrder(orderSaveDto); | |||
| dto.setCount(1); | |||
| list.add(dto); | |||
| return wxOrderService.composeSaveOrder(EnumComposeOrder.SINGLE,list,memberId,EnumPayWay.PAY_WAY_WECHAT,getTenantInfo()); | |||
| return wxOrderService.composeSaveOrder(false,EnumComposeOrder.SINGLE,list,memberId,EnumPayWay.PAY_WAY_WECHAT,getTenantInfo()); | |||
| } | |||
| @ApiOperation(value = "取消订单", notes = "{\"orderId\":\"string\"}") | |||
| @@ -61,6 +61,9 @@ public class WxCouponOrder extends TenantEntity { | |||
| private Integer composeOrderType; | |||
| @io.swagger.annotations.ApiModelProperty(value="组合订单编号",name="composeOrderId") | |||
| private Long composeOrderId; | |||
| @io.swagger.annotations.ApiModelProperty(value="商品数量",name="couponNumber") | |||
| private Integer couponNumber; | |||
| @TableField(exist = false) | |||
| private String couponName; | |||
| @@ -190,7 +190,7 @@ public interface WxOrderService { | |||
| * @param coupon | |||
| * @return | |||
| */ | |||
| WxComposeOrder saveOrderForCoupon(EnumComposeOrder composeOrderType,WxCUserBasicInfo user, List<OrderComposeSaveDto> orderSave,EnumPayWay payWay); | |||
| WxComposeOrder saveOrderForCoupon(boolean allowUnPayOrder,EnumComposeOrder composeOrderType,WxCUserBasicInfo user, List<OrderComposeSaveDto> orderSave,EnumPayWay payWay); | |||
| void sendOrderSuccessActionMsg(WxOrder updateOrder); | |||
| /** | |||
| @@ -209,12 +209,12 @@ public interface WxOrderService { | |||
| boolean checkCouponIsFree(WxCoupon coupon,Integer shippingType); | |||
| // 2. 创建免费订单, 领取 couponOrder | |||
| WxOrder saveFreeOrderForCoupon(WxComposeOrder composeOrder, WxCUserBasicInfo user, WxCoupon coupon, int couponNumber, | |||
| WxOrder saveFreeOrderForCoupon(boolean allowUnPayOrder,WxComposeOrder composeOrder, WxCUserBasicInfo user, WxCoupon coupon, int couponNumber, | |||
| Long couponChannelId, String formId, Long couponPasswordId, EnumPayWay payWay, | |||
| Integer shippingType, UserBasicInfoAddress address); | |||
| // 3. 创建有价订单 | |||
| WxOrder saveNoFreeOrderForCoupon(WxComposeOrder composeOrder,WxCUserBasicInfo user, WxCoupon coupon,int couponNumber,OrderComposeSaveDto orderdto); | |||
| WxOrder saveNoFreeOrderForCoupon(boolean allowUnPayOrder,WxComposeOrder composeOrder,WxCUserBasicInfo user, WxCoupon coupon,int couponNumber,OrderComposeSaveDto orderdto); | |||
| /** | |||
| * 下订单成功后处理 | |||
| @@ -241,5 +241,5 @@ public interface WxOrderService { | |||
| //ResultData saveOrder(OrderSaveDto orderSaveDto,Long cUserId,EnumPayWay payWay,TenantEntity tenantEntity); | |||
| ResultData composeSaveOrder(EnumComposeOrder composeOrderType,List<OrderComposeSaveDto> composeOrderSaveDto,Long cUserId,EnumPayWay payWay,TenantEntity tenantEntity); | |||
| ResultData composeSaveOrder(boolean allowUnPayOrder,EnumComposeOrder composeOrderType,List<OrderComposeSaveDto> composeOrderSaveDto,Long cUserId,EnumPayWay payWay,TenantEntity tenantEntity); | |||
| } | |||
| @@ -460,7 +460,7 @@ public class WxGameServiceImpl implements WxGameService { | |||
| ocsd.setSignleOrder(orderSaveDto); | |||
| ocsd.setCount(1); | |||
| orderSave.add(ocsd); | |||
| ResultData resultData1 = wxOrderService.composeSaveOrder(EnumComposeOrder.SINGLE,orderSave, userId, EnumPayWay.PAY_WAY_WECHAT, wxGame); | |||
| ResultData resultData1 = wxOrderService.composeSaveOrder(false,EnumComposeOrder.SINGLE,orderSave, userId, EnumPayWay.PAY_WAY_WECHAT, wxGame); | |||
| if(resultData1.code == Result.SUCCESS && resultData1.data != null && resultData1.data instanceof WxComposeOrder){ | |||
| WxComposeOrder order = (WxComposeOrder)resultData1.data; | |||
| @@ -565,7 +565,7 @@ public class WxOrderServiceImpl implements WxOrderService { | |||
| * @param couponIdStr | |||
| */ | |||
| @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) | |||
| public void stockReduce(WxCUserBasicInfo user, WxCoupon coupon, String couponIdStr,int number) { | |||
| public void stockReduce(boolean allowUnPayOrder,WxCUserBasicInfo user, WxCoupon coupon, String couponIdStr,int number) { | |||
| //如果缓存中不存在这个key,则从coupon中取 | |||
| if(!redisLock.hasCouponStockCache(coupon.getId())) { | |||
| //此处需要加锁,防止并发设置 | |||
| @@ -606,16 +606,18 @@ public class WxOrderServiceImpl implements WxOrderService { | |||
| int count = 0; | |||
| // 有价券 | |||
| if (coupon.getSalePrice() > 0) { | |||
| // 检查是否未支付订单 | |||
| try { | |||
| count = getUserOrderCount(user, coupon); | |||
| } catch (Exception e) { | |||
| throw new MallinkException(ErrorCode.DB_FAIL.getCode(),"["+coupon.getTitle()+"]查询未支付订单失败."); | |||
| } | |||
| if (count > 0) { | |||
| logger.error("此券有未支付的订单, couponId: " + couponIdStr + ", count: " + count); | |||
| throw new MallinkException(ErrorCode.ORDER_UNPAID.getCode(),"["+coupon.getTitle()+"]您有未支付的订单."); | |||
| } | |||
| if (!allowUnPayOrder) { | |||
| // 检查是否未支付订单 | |||
| try { | |||
| count = getUserOrderCount(user, coupon); | |||
| } catch (Exception e) { | |||
| throw new MallinkException(ErrorCode.DB_FAIL.getCode(),"["+coupon.getTitle()+"]查询未支付订单失败."); | |||
| } | |||
| if (count > 0) { | |||
| logger.error("此券有未支付的订单, couponId: " + couponIdStr + ", count: " + count); | |||
| throw new MallinkException(ErrorCode.ORDER_UNPAID.getCode(),"["+coupon.getTitle()+"]您有未支付的订单."); | |||
| } | |||
| } | |||
| } | |||
| //检查拼团中的数量 | |||
| try { | |||
| @@ -1065,6 +1067,7 @@ public class WxOrderServiceImpl implements WxOrderService { | |||
| } | |||
| couponOrder.setComposeOrderType(order.getComposeOrderType()); | |||
| couponOrder.setComposeOrderId(order.getComposeOrderId()); | |||
| couponOrder.setCouponNumber(order.getCouponNumber()); | |||
| couponOrder.setFreightPrice(order.getFreightPrice()); | |||
| couponOrder.setShippingType(order.getShippingType()); | |||
| @@ -1297,7 +1300,7 @@ public class WxOrderServiceImpl implements WxOrderService { | |||
| } else { | |||
| // 减库存操作 | |||
| try { | |||
| stockReduce(user, coupon, couponIdStr,1); | |||
| stockReduce(false,user, coupon, couponIdStr,1); | |||
| }catch(Exception e) { | |||
| throw new MallinkException(ErrorCode.COUPON_STOCK_ERR.getCode(), e.getMessage()); | |||
| } | |||
| @@ -1990,7 +1993,7 @@ public class WxOrderServiceImpl implements WxOrderService { | |||
| @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) | |||
| @Override | |||
| public WxComposeOrder saveOrderForCoupon(EnumComposeOrder composeOrderType,WxCUserBasicInfo user,List<OrderComposeSaveDto> orderSave,EnumPayWay payWay) { | |||
| public WxComposeOrder saveOrderForCoupon(boolean allowUnPayOrder,EnumComposeOrder composeOrderType,WxCUserBasicInfo user,List<OrderComposeSaveDto> orderSave,EnumPayWay payWay) { | |||
| WxOrderServiceImpl proxy = (WxOrderServiceImpl) AopContext.currentProxy(); | |||
| // 防止同一用户重复下单,1秒内 | |||
| String key = new StringBuilder().append("saveComposeOrder:").append(user.getId()).toString(); | |||
| @@ -2011,10 +2014,10 @@ public class WxOrderServiceImpl implements WxOrderService { | |||
| boolean isOneNumberOneOrder = orderAdapterService.isOneNumberOneOrder(); | |||
| if (isOneNumberOneOrder) { | |||
| for (int j = 0; j < orderdto.getCount(); j++) { | |||
| lastOrder = proxy.handleSaveOrderForCouponSingle(composeOrder, user, orderdto.getWxCoupon(), 1, orderdto, payWay); | |||
| lastOrder = proxy.handleSaveOrderForCouponSingle(allowUnPayOrder,composeOrder, user, orderdto.getWxCoupon(), 1, orderdto, payWay); | |||
| } | |||
| }else { | |||
| lastOrder = proxy.handleSaveOrderForCouponSingle(composeOrder, user, orderdto.getWxCoupon(), orderdto.getCount(), orderdto, payWay); | |||
| lastOrder = proxy.handleSaveOrderForCouponSingle(allowUnPayOrder,composeOrder, user, orderdto.getWxCoupon(), orderdto.getCount(), orderdto, payWay); | |||
| } | |||
| } | |||
| //如果没有orderId,则用lastOrder的信息 | |||
| @@ -2025,16 +2028,14 @@ public class WxOrderServiceImpl implements WxOrderService { | |||
| } | |||
| @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) | |||
| public WxOrder handleSaveOrderForCouponSingle(WxComposeOrder composeOrder,WxCUserBasicInfo user,WxCoupon coupon,int perCouponNumber,OrderComposeSaveDto orderdto,EnumPayWay payWay) { | |||
| public WxOrder handleSaveOrderForCouponSingle(boolean allowUnPayOrder,WxComposeOrder composeOrder,WxCUserBasicInfo user,WxCoupon coupon,int perCouponNumber,OrderComposeSaveDto orderdto,EnumPayWay payWay) { | |||
| WxOrderServiceImpl proxy = (WxOrderServiceImpl) AopContext.currentProxy(); | |||
| // 是否砍价 | |||
| WxOrder order = null; | |||
| if (checkCouponIsFree(coupon,orderdto.getShippingType())) { | |||
| // 免费券 | |||
| order = proxy.saveFreeOrderForCoupon(composeOrder,user, coupon,perCouponNumber, | |||
| orderdto.getSignleOrder().getCouponChannelId(), orderdto.getSignleOrder().getFormId(), | |||
| null,payWay, | |||
| orderdto.getShippingType(),orderdto.getAddress()); | |||
| order = proxy.saveFreeOrderForCoupon(allowUnPayOrder,composeOrder,user, coupon,perCouponNumber,orderdto.getSignleOrder().getCouponChannelId(), | |||
| orderdto.getSignleOrder().getFormId(),null,payWay,orderdto.getShippingType(),orderdto.getAddress()); | |||
| if (order != null) { | |||
| // 6. 下订单完成,发送内部消息 | |||
| // 下订单完成,发送内部消息 | |||
| @@ -2047,7 +2048,7 @@ public class WxOrderServiceImpl implements WxOrderService { | |||
| } | |||
| } else { | |||
| // 有价券 | |||
| order = proxy.saveNoFreeOrderForCoupon(composeOrder,user, orderdto.getWxCoupon(),perCouponNumber, orderdto); | |||
| order = proxy.saveNoFreeOrderForCoupon(allowUnPayOrder,composeOrder,user, orderdto.getWxCoupon(),perCouponNumber, orderdto); | |||
| } | |||
| // couponActionLog | |||
| // try { | |||
| @@ -2072,13 +2073,13 @@ public class WxOrderServiceImpl implements WxOrderService { | |||
| @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) | |||
| @Override | |||
| public WxOrder saveFreeOrderForCoupon(WxComposeOrder composeOrder,WxCUserBasicInfo user, WxCoupon coupon,int couponNumber, | |||
| public WxOrder saveFreeOrderForCoupon(boolean allowUnPayOrder,WxComposeOrder composeOrder,WxCUserBasicInfo user, WxCoupon coupon,int couponNumber, | |||
| Long couponChannelId, String formId, Long couponPasswordId,EnumPayWay payWay, | |||
| Integer shippingType, UserBasicInfoAddress address) { | |||
| WxOrderServiceImpl proxy = (WxOrderServiceImpl) AopContext.currentProxy(); | |||
| // 减库存操作 | |||
| String couponIdStr = String.valueOf(coupon.getId()); | |||
| proxy.stockReduce(user, coupon, couponIdStr,couponNumber); | |||
| proxy.stockReduce(allowUnPayOrder,user, coupon, couponIdStr,couponNumber); | |||
| // 当积分券或者积分停车券时 则进行积分支付 | |||
| Integer orderType; | |||
| @@ -2121,7 +2122,6 @@ public class WxOrderServiceImpl implements WxOrderService { | |||
| logger.error("下订单错误:" + e.getMessage(),e); | |||
| throw new MallinkException(ErrorCode.ORDER_SAVE_ERR.getCode(),"["+coupon.getTitle()+"]保存订单错误."+e.getMessage()); | |||
| } | |||
| // 5. 创建couponOrder | |||
| try { | |||
| proxy.createCouponOrder(record, user, coupon, couponPasswordId,payWay,null,null); | |||
| @@ -2134,11 +2134,11 @@ public class WxOrderServiceImpl implements WxOrderService { | |||
| @Override | |||
| @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) | |||
| public WxOrder saveNoFreeOrderForCoupon(WxComposeOrder composeOrder,WxCUserBasicInfo user, WxCoupon coupon,int couponNumber,OrderComposeSaveDto orderdto) { | |||
| public WxOrder saveNoFreeOrderForCoupon(boolean allowUnPayOrder,WxComposeOrder composeOrder,WxCUserBasicInfo user, WxCoupon coupon,int couponNumber,OrderComposeSaveDto orderdto) { | |||
| WxOrderServiceImpl proxy = (WxOrderServiceImpl) AopContext.currentProxy(); | |||
| String couponIdStr = String.valueOf(coupon.getId()); | |||
| // 3. 减库存操作 | |||
| proxy.stockReduce(user, coupon, couponIdStr,couponNumber); | |||
| proxy.stockReduce(allowUnPayOrder,user, coupon, couponIdStr,couponNumber); | |||
| // 3. 当积分券或者积分停车券时 则进行积分支付 | |||
| Integer orderType; | |||
| @@ -2213,7 +2213,7 @@ public class WxOrderServiceImpl implements WxOrderService { | |||
| } | |||
| // 2. 减库存操作 | |||
| String couponIdStr = String.valueOf(coupon.getId()); | |||
| stockReduce(user, coupon, couponIdStr,1); | |||
| stockReduce(false,user, coupon, couponIdStr,1); | |||
| // 3. 当积分券或者积分停车券时 则进行积分支付 | |||
| Integer orderType; | |||
| @@ -2472,7 +2472,7 @@ public class WxOrderServiceImpl implements WxOrderService { | |||
| @Override | |||
| public ResultData composeSaveOrder(EnumComposeOrder composeOrderType,List<OrderComposeSaveDto> composeOrderSaveDto,Long cUserId,EnumPayWay payWay,TenantEntity tenantEntity) { | |||
| public ResultData composeSaveOrder(boolean allowUnPayOrder,EnumComposeOrder composeOrderType,List<OrderComposeSaveDto> composeOrderSaveDto,Long cUserId,EnumPayWay payWay,TenantEntity tenantEntity) { | |||
| try { | |||
| if (null == composeOrderSaveDto || composeOrderSaveDto.size() <= 0 ) { | |||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"无商品信息"); | |||
| @@ -2496,7 +2496,7 @@ public class WxOrderServiceImpl implements WxOrderService { | |||
| } | |||
| WxOrderServiceImpl proxy = (WxOrderServiceImpl) AopContext.currentProxy(); | |||
| try { | |||
| WxComposeOrder order = proxy.saveOrderForCoupon(composeOrderType,wxCUserBasicInfo, composeOrderSaveDto, payWay); | |||
| WxComposeOrder order = proxy.saveOrderForCoupon(allowUnPayOrder,composeOrderType,wxCUserBasicInfo, composeOrderSaveDto, payWay); | |||
| return new ResultData(order); | |||
| } catch (MallinkException e) { | |||
| logger.error("saveOrderForCoupon error.",e); | |||
| @@ -24,6 +24,7 @@ | |||
| <result column="send_merchant_user_id" jdbcType="INTEGER" property="sendMerchantUserId" /> | |||
| <result column="compose_order_type" jdbcType="INTEGER" property="composeOrderType" /> | |||
| <result column="compose_order_id" jdbcType="BIGINT" property="composeOrderId" /> | |||
| <result column="coupon_number" jdbcType="BIGINT" property="couponNumber" /> | |||
| <result column="freight_price" jdbcType="INTEGER" property="freightPrice"/> | |||
| <result column="shipping_type" jdbcType="INTEGER" property="shippingType"/> | |||
| @@ -34,7 +35,7 @@ | |||
| <sql id="allColumns"> | |||
| `id`,`tenant_id`,`parent_tenant_id`,`coupon_id`,`coupon_type`,`c_user_id`,`owner_id`,`b_user_id`,`order_id`,`expired_time`,`coupon_order_status`,`create_date`,`update_date`,`coupon_price`, `auto_refund`, | |||
| `verify_type`,`verify_remark`,`pay_vendor`,`send_merchant_id`,`send_merchant_user_id`,`compose_order_type`,`compose_order_id`, | |||
| `verify_type`,`verify_remark`,`pay_vendor`,`send_merchant_id`,`send_merchant_user_id`,`compose_order_type`,`compose_order_id`,`coupon_number`, | |||
| `freight_price`,`shipping_type`,`shipping_address`,`shipping_status`,`delivery_info` | |||
| </sql> | |||
| @@ -747,7 +748,7 @@ | |||
| <result column="shipping_address" jdbcType="VARCHAR" property="shippingAddress"/> | |||
| <result column="shipping_status" jdbcType="INTEGER" property="shippingStatus"/> | |||
| <result column="delivery_info" jdbcType="VARCHAR" property="deliveryInfo"/> | |||
| <result column="merchant_id" jdbcType="BIGINT" property="merchantId"/> | |||
| <result column="type" jdbcType="INTEGER" property="type" /> | |||