Browse Source

Merge branch 'release_toaliyun_real_202211' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real_202211

release_toaliyun_real
xhxu 3 years ago
parent
commit
a1c7942c91
4 changed files with 336 additions and 8 deletions
  1. +2
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponOrderController.java
  2. +3
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxProfitSharingOrderController.java
  3. +308
    -1
      mallinkAdmin/src/main/resources/db/migration/V2022111500001__plat_coupon.sql
  4. +23
    -6
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java

+ 2
- 1
mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponOrderController.java View File

@@ -46,6 +46,7 @@ public class WxCouponOrderController extends BaseController {
@Autowired
private WxAppinfoService wxAppinfoService;

@TenantIgnore
@ApiOperation("分页列表接口")
@GetMapping("list")
@ApiImplicitParams({
@@ -79,12 +80,12 @@ public class WxCouponOrderController extends BaseController {
return wxCouponOrderService.listAdminAsPage(wxCouponOrder, pageNum, pageSize);
}

@TenantIgnore
@ApiOperation(value = "卡券详情接口")
@GetMapping("detail")
@ApiImplicitParams({
@ApiImplicitParam(name = "couponOrderId", value = "券ID", dataType = "Long", paramType = "query", required = true)
})
@SystemControllerLog(description = "券包-卡券详情")
public ResultData detail(@RequestParam("couponOrderId") Long couponOrderId) {
if(couponOrderId == null) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL);


+ 3
- 0
mallinkAdmin/src/main/java/com/iformall/controller/market/WxProfitSharingOrderController.java View File

@@ -38,6 +38,7 @@ public class WxProfitSharingOrderController extends BaseController {
@Autowired
private WxProfitSharingOrderService wxProfitSharingOrderService;

@TenantIgnore
@ApiOperation("分页列表接口")
@GetMapping("list")
@ApiImplicitParams({
@@ -48,6 +49,7 @@ public class WxProfitSharingOrderController extends BaseController {
if (null == order) {
order = new WxProfitSharingOrderQueryVo();
}
order.updateTenantInfo(getTenantInfo());
final PageInfo<WxProfitSharingOrderVo> page = wxProfitSharingOrderService.listAsPage(order, pageNum, pageSize);
return new ResultData(page);
}
@@ -81,6 +83,7 @@ public class WxProfitSharingOrderController extends BaseController {
wxProfitSharingOrderService.exportData(order, request, response);
}

@TenantIgnore
@ApiOperation("记录导出")
@GetMapping("/exportGroupData")
@SystemControllerLog(description = "线上自动分账记录-导出")


+ 308
- 1
mallinkAdmin/src/main/resources/db/migration/V2022111500001__plat_coupon.sql View File

@@ -719,4 +719,311 @@ ALTER TABLE `mallink`.`wx_profit_sharing_order_99`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;

ALTER TABLE `mallink`.`wx_profit_sharing_result`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;

UPDATE wx_coupon_order_0 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_1 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_2 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_3 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_4 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_5 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_6 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_7 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_8 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_9 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_10 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_11 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_12 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_13 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_14 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_15 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_16 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_17 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_18 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_19 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_20 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_21 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_22 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_23 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_24 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_25 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_26 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_27 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_28 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_29 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_30 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_31 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_32 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_33 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_34 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_35 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_36 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_37 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_38 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_39 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_40 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_41 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_42 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_43 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_44 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_45 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_46 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_47 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_48 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_49 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_50 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_51 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_52 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_53 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_54 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_55 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_56 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_57 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_58 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_59 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_60 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_61 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_62 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_63 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_64 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_65 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_66 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_67 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_68 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_69 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_70 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_71 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_72 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_73 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_74 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_75 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_76 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_77 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_78 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_79 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_80 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_81 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_82 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_83 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_84 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_85 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_86 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_87 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_88 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_89 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_90 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_91 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_92 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_93 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_94 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_95 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_96 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_97 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_98 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_coupon_order_99 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');


UPDATE wx_profit_sharing_order_0 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_1 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_2 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_3 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_4 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_5 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_6 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_7 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_8 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_9 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_10 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_11 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_12 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_13 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_14 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_15 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_16 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_17 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_18 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_19 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_20 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_21 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_22 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_23 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_24 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_25 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_26 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_27 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_28 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_29 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_30 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_31 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_32 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_33 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_34 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_35 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_36 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_37 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_38 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_39 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_40 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_41 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_42 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_43 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_44 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_45 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_46 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_47 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_48 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_49 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_50 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_51 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_52 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_53 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_54 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_55 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_56 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_57 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_58 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_59 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_60 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_61 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_62 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_63 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_64 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_65 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_66 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_67 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_68 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_69 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_70 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_71 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_72 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_73 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_74 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_75 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_76 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_77 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_78 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_79 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_80 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_81 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_82 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_83 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_84 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_85 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_86 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_87 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_88 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_89 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_90 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_91 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_92 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_93 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_94 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_95 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_96 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_97 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_98 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_profit_sharing_order_99 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');

UPDATE wx_merchant_subsidy_0 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_1 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_2 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_3 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_4 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_5 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_6 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_7 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_8 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_9 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_10 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_11 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_12 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_13 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_14 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_15 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_16 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_17 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_18 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_19 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_20 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_21 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_22 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_23 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_24 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_25 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_26 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_27 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_28 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_29 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_30 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_31 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_32 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_33 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_34 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_35 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_36 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_37 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_38 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_39 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_40 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_41 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_42 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_43 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_44 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_45 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_46 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_47 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_48 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_49 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_50 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_51 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_52 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_53 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_54 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_55 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_56 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_57 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_58 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_59 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_60 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_61 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_62 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_63 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_64 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_65 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_66 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_67 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_68 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_69 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_70 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_71 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_72 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_73 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_74 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_75 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_76 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_77 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_78 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_79 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_80 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_81 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_82 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_83 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_84 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_85 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_86 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_87 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_88 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_89 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_90 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_91 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_92 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_93 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_94 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_95 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_96 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_97 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_98 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');
UPDATE wx_merchant_subsidy_99 SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');


UPDATE wx_profit_sharing_result SET b_tenant_id = tenant_id WHERE tenant_id NOT IN ('1031','1032','1033','1034');

+ 23
- 6
mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java View File

@@ -535,14 +535,31 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
}
}
Map<Long, List<WxMerchantVo>> couponMerchantVoMap = null;
if (null != mallCouponMerchantVoMap) {
couponMerchantVoMap = new HashMap<Long, List<WxMerchantVo>>();
for (Iterator<String> it = mallCouponMerchantVoMap.keySet().iterator();it.hasNext();) {
String mtid = it.next();
Map<Long,List<WxMerchantVo>> couponMerchantList = mallCouponMerchantVoMap.get(mtid);
if (null != couponMerchantList) {
for (Iterator<Long> cid = couponMerchantList.keySet().iterator();cid.hasNext();) {
Long couponId = cid.next();
List<WxMerchantVo> merchantVoList = couponMerchantList.get(couponId);
if (null != merchantVoList && merchantVoList.size() > 0 ) {
List<WxMerchantVo> vlist = couponMerchantVoMap.get(couponId);
if (null != vlist && vlist.size() > 0 ) {
merchantVoList.addAll(vlist);
}
couponMerchantVoMap.put(couponId, merchantVoList);
}
}
}
}
}
for (int i = 0 ; i < couponOrderList.size() ; i ++) {
WxCouponOrder couponOrder = couponOrderList.get(i);
Map<Long, List<WxMerchantVo>> couponMerchantVoMap = null;
if (!StringUtils.isBlank(couponOrder.getBTenantId())) {
if (null != mallCouponMerchantVoMap){
couponMerchantVoMap = mallCouponMerchantVoMap.get(couponOrder.getBTenantId());
}
}
if (null == couponMerchantVoMap) {
couponMerchantVoMap = new HashMap<Long, List<WxMerchantVo>>();
}


Loading…
Cancel
Save