diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java index b43be9138..ae0c98211 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java @@ -606,6 +606,7 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity //创建订单关联 wxOfflineActivityRecordGrantService.insertFromGrantAward(wxOfflineActivityGrantAward); + //针对筛选订单模式 wxOfflineActivityGrantItemRecordService.insertFromGrantAward(wxOfflineActivityGrantAward); //处理奖项 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantSettlementServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantSettlementServiceImpl.java index 4cac04fd6..1f9b2d13d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantSettlementServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantSettlementServiceImpl.java @@ -103,6 +103,7 @@ public class WxOfflineActivityGrantSettlementServiceImpl implements WxOfflineAct } List itemSettlementList = new ArrayList<>(); + //按单笔订单算的 if(wxOfflineActivityGrantItem.getRecordId() != null){ WxOfflineActivityGrantSettlement settlement = new WxOfflineActivityGrantSettlement(); settlement.setId(idWorker.nextId()); diff --git a/mallinkService/src/main/resources/mapper/WxOfflineActivityGrantCashBackMapper.xml b/mallinkService/src/main/resources/mapper/WxOfflineActivityGrantCashBackMapper.xml index 5f788aa4b..1764eeb61 100644 --- a/mallinkService/src/main/resources/mapper/WxOfflineActivityGrantCashBackMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOfflineActivityGrantCashBackMapper.xml @@ -74,7 +74,7 @@ insert into wx_offline_activity_grant_cash_back - (id, + (id,tenant_id,parent_tenant_id, grant_id,activity_id,activity_name, activity_item_id,activity_item_name,activity_item_type, awards_item_rule, @@ -82,7 +82,7 @@ ,max_amount,starting_tax_point,tax_points,cash_back_price,tax_points_amount) values - (#{item.id,jdbcType=BIGINT}, + (#{item.id,jdbcType=BIGINT},#{item.tenantId,jdbcType=VARCHAR},#{item.parentTenantId,jdbcType=VARCHAR}, #{item.grantId,jdbcType=BIGINT},#{item.activityId,jdbcType=BIGINT},#{item.activityName,jdbcType=VARCHAR}, #{item.activityItemId,jdbcType=BIGINT},#{item.activityItemName,jdbcType=VARCHAR},#{item.activityItemType,jdbcType=INTEGER}, #{item.awardsItemRule,jdbcType=INTEGER}, diff --git a/mallinkService/src/main/resources/mapper/WxOfflineActivityGrantItemMapper.xml b/mallinkService/src/main/resources/mapper/WxOfflineActivityGrantItemMapper.xml index e7c0bebf8..34601b4a5 100644 --- a/mallinkService/src/main/resources/mapper/WxOfflineActivityGrantItemMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOfflineActivityGrantItemMapper.xml @@ -97,7 +97,7 @@ insert into wx_offline_activity_grant_item - (id, + (id,tenant_id,parent_tenant_id, grant_id,grant_awards_mode,activity_id,activity_name, activity_item_id,activity_item_name,activity_item_type, award_itam_id,award_name,award_grade, @@ -107,7 +107,7 @@ create_date,update_date,record_id) values - (#{item.id,jdbcType=BIGINT}, + (#{item.id,jdbcType=BIGINT},#{item.tenantId,jdbcType=VARCHAR},#{item.parentTenantId,jdbcType=VARCHAR}, #{item.grantId,jdbcType=BIGINT},#{item.grantAwardsMode,jdbcType=INTEGER},#{item.activityId,jdbcType=BIGINT},#{item.activityName,jdbcType=VARCHAR}, #{item.activityItemId,jdbcType=BIGINT},#{item.activityItemName,jdbcType=VARCHAR},#{item.activityItemType,jdbcType=INTEGER}, #{item.awardItamId,jdbcType=BIGINT},#{item.awardName,jdbcType=VARCHAR},#{item.awardGrade,jdbcType=INTEGER}, diff --git a/mallinkService/src/main/resources/mapper/WxOfflineActivityGrantSettlementMapper.xml b/mallinkService/src/main/resources/mapper/WxOfflineActivityGrantSettlementMapper.xml index 7a607b0a8..452c0ee2f 100644 --- a/mallinkService/src/main/resources/mapper/WxOfflineActivityGrantSettlementMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOfflineActivityGrantSettlementMapper.xml @@ -115,7 +115,7 @@ insert into wx_offline_activity_grant_settlement - (id, + (id,tenant_id,parent_tenant_id, record_id,order_no,order_money, merchant_id,activity_id,activity_item_id, award_itam_id,grant_id,grant_item_id,grant_awards_mode,grant_price, @@ -124,7 +124,7 @@ create_date,update_date) values - (#{item.id,jdbcType=BIGINT}, + (#{item.id,jdbcType=BIGINT},#{item.tenantId,jdbcType=VARCHAR},#{item.parentTenantId,jdbcType=VARCHAR}, #{item.recordId,jdbcType=BIGINT},#{item.orderNo,jdbcType=VARCHAR},#{item.orderMoney,jdbcType=DECIMAL}, #{item.merchantId,jdbcType=BIGINT},#{item.activityId,jdbcType=BIGINT},#{item.activityItemId,jdbcType=BIGINT}, #{item.awardItamId,jdbcType=BIGINT},#{item.grantId,jdbcType=BIGINT},#{item.grantItemId,jdbcType=BIGINT},#{item.grantAwardsMode,jdbcType=INTEGER},#{item.grantPrice,jdbcType=DECIMAL}, diff --git a/mallinkService/src/main/resources/mapper/WxOfflineActivityRecordGrantMapper.xml b/mallinkService/src/main/resources/mapper/WxOfflineActivityRecordGrantMapper.xml index f6ea82b3a..c1fcb5b91 100644 --- a/mallinkService/src/main/resources/mapper/WxOfflineActivityRecordGrantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOfflineActivityRecordGrantMapper.xml @@ -24,10 +24,11 @@ insert into wx_offline_activity_record_grant - (`activity_id`,`record_id`,`grant_id`) + (`tenant_id`,`parent_tenant_id`,`activity_id`,`record_id`,`grant_id`) values - (#{item.activityId,jdbcType=BIGINT}, + (#{item.tenantId},#{item.parentTenantId}, + #{item.activityId,jdbcType=BIGINT}, #{item.recordId,jdbcType=BIGINT}, #{item.grantId,jdbcType=BIGINT})