| @@ -606,6 +606,7 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity | |||||
| //创建订单关联 | //创建订单关联 | ||||
| wxOfflineActivityRecordGrantService.insertFromGrantAward(wxOfflineActivityGrantAward); | wxOfflineActivityRecordGrantService.insertFromGrantAward(wxOfflineActivityGrantAward); | ||||
| //针对筛选订单模式 | |||||
| wxOfflineActivityGrantItemRecordService.insertFromGrantAward(wxOfflineActivityGrantAward); | wxOfflineActivityGrantItemRecordService.insertFromGrantAward(wxOfflineActivityGrantAward); | ||||
| //处理奖项 | //处理奖项 | ||||
| @@ -103,6 +103,7 @@ public class WxOfflineActivityGrantSettlementServiceImpl implements WxOfflineAct | |||||
| } | } | ||||
| List<WxOfflineActivityGrantSettlement> itemSettlementList = new ArrayList<>(); | List<WxOfflineActivityGrantSettlement> itemSettlementList = new ArrayList<>(); | ||||
| //按单笔订单算的 | |||||
| if(wxOfflineActivityGrantItem.getRecordId() != null){ | if(wxOfflineActivityGrantItem.getRecordId() != null){ | ||||
| WxOfflineActivityGrantSettlement settlement = new WxOfflineActivityGrantSettlement(); | WxOfflineActivityGrantSettlement settlement = new WxOfflineActivityGrantSettlement(); | ||||
| settlement.setId(idWorker.nextId()); | settlement.setId(idWorker.nextId()); | ||||
| @@ -74,7 +74,7 @@ | |||||
| <insert id="insertList" parameterType="java.util.List"> | <insert id="insertList" parameterType="java.util.List"> | ||||
| insert into wx_offline_activity_grant_cash_back | insert into wx_offline_activity_grant_cash_back | ||||
| (id, | |||||
| (id,tenant_id,parent_tenant_id, | |||||
| grant_id,activity_id,activity_name, | grant_id,activity_id,activity_name, | ||||
| activity_item_id,activity_item_name,activity_item_type, | activity_item_id,activity_item_name,activity_item_type, | ||||
| awards_item_rule, | awards_item_rule, | ||||
| @@ -82,7 +82,7 @@ | |||||
| ,max_amount,starting_tax_point,tax_points,cash_back_price,tax_points_amount) | ,max_amount,starting_tax_point,tax_points,cash_back_price,tax_points_amount) | ||||
| values | values | ||||
| <foreach collection="cashBackList" item="item" index="index" separator=","> | <foreach collection="cashBackList" item="item" index="index" separator=","> | ||||
| (#{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.grantId,jdbcType=BIGINT},#{item.activityId,jdbcType=BIGINT},#{item.activityName,jdbcType=VARCHAR}, | ||||
| #{item.activityItemId,jdbcType=BIGINT},#{item.activityItemName,jdbcType=VARCHAR},#{item.activityItemType,jdbcType=INTEGER}, | #{item.activityItemId,jdbcType=BIGINT},#{item.activityItemName,jdbcType=VARCHAR},#{item.activityItemType,jdbcType=INTEGER}, | ||||
| #{item.awardsItemRule,jdbcType=INTEGER}, | #{item.awardsItemRule,jdbcType=INTEGER}, | ||||
| @@ -97,7 +97,7 @@ | |||||
| <insert id="insertList" parameterType="java.util.List"> | <insert id="insertList" parameterType="java.util.List"> | ||||
| insert into wx_offline_activity_grant_item | insert into wx_offline_activity_grant_item | ||||
| (id, | |||||
| (id,tenant_id,parent_tenant_id, | |||||
| grant_id,grant_awards_mode,activity_id,activity_name, | grant_id,grant_awards_mode,activity_id,activity_name, | ||||
| activity_item_id,activity_item_name,activity_item_type, | activity_item_id,activity_item_name,activity_item_type, | ||||
| award_itam_id,award_name,award_grade, | award_itam_id,award_name,award_grade, | ||||
| @@ -107,7 +107,7 @@ | |||||
| create_date,update_date,record_id) | create_date,update_date,record_id) | ||||
| values | values | ||||
| <foreach collection="grantItemList" item="item" index="index" separator=","> | <foreach collection="grantItemList" item="item" index="index" separator=","> | ||||
| (#{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.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.activityItemId,jdbcType=BIGINT},#{item.activityItemName,jdbcType=VARCHAR},#{item.activityItemType,jdbcType=INTEGER}, | ||||
| #{item.awardItamId,jdbcType=BIGINT},#{item.awardName,jdbcType=VARCHAR},#{item.awardGrade,jdbcType=INTEGER}, | #{item.awardItamId,jdbcType=BIGINT},#{item.awardName,jdbcType=VARCHAR},#{item.awardGrade,jdbcType=INTEGER}, | ||||
| @@ -115,7 +115,7 @@ | |||||
| <insert id="insertList" parameterType="java.util.List"> | <insert id="insertList" parameterType="java.util.List"> | ||||
| insert into wx_offline_activity_grant_settlement | insert into wx_offline_activity_grant_settlement | ||||
| (id, | |||||
| (id,tenant_id,parent_tenant_id, | |||||
| record_id,order_no,order_money, | record_id,order_no,order_money, | ||||
| merchant_id,activity_id,activity_item_id, | merchant_id,activity_id,activity_item_id, | ||||
| award_itam_id,grant_id,grant_item_id,grant_awards_mode,grant_price, | award_itam_id,grant_id,grant_item_id,grant_awards_mode,grant_price, | ||||
| @@ -124,7 +124,7 @@ | |||||
| create_date,update_date) | create_date,update_date) | ||||
| values | values | ||||
| <foreach collection="settlementList" item="item" index="index" separator=","> | <foreach collection="settlementList" item="item" index="index" separator=","> | ||||
| (#{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.recordId,jdbcType=BIGINT},#{item.orderNo,jdbcType=VARCHAR},#{item.orderMoney,jdbcType=DECIMAL}, | ||||
| #{item.merchantId,jdbcType=BIGINT},#{item.activityId,jdbcType=BIGINT},#{item.activityItemId,jdbcType=BIGINT}, | #{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}, | #{item.awardItamId,jdbcType=BIGINT},#{item.grantId,jdbcType=BIGINT},#{item.grantItemId,jdbcType=BIGINT},#{item.grantAwardsMode,jdbcType=INTEGER},#{item.grantPrice,jdbcType=DECIMAL}, | ||||
| @@ -24,10 +24,11 @@ | |||||
| <insert id="insertList" parameterType="java.util.List"> | <insert id="insertList" parameterType="java.util.List"> | ||||
| insert into wx_offline_activity_record_grant | 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 | values | ||||
| <foreach collection="recordGrantList" item="item" index="index" separator=","> | <foreach collection="recordGrantList" item="item" index="index" separator=","> | ||||
| (#{item.activityId,jdbcType=BIGINT}, | |||||
| (#{item.tenantId},#{item.parentTenantId}, | |||||
| #{item.activityId,jdbcType=BIGINT}, | |||||
| #{item.recordId,jdbcType=BIGINT}, | #{item.recordId,jdbcType=BIGINT}, | ||||
| #{item.grantId,jdbcType=BIGINT}) | #{item.grantId,jdbcType=BIGINT}) | ||||
| </foreach> | </foreach> | ||||