diff --git a/mallinkAdmin/src/main/resources/db/migration/V202411000000002.sql b/mallinkAdmin/src/main/resources/db/migration/V202411000000002.sql new file mode 100644 index 000000000..a1e34106b --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V202411000000002.sql @@ -0,0 +1,15 @@ +ALTER TABLE `mallink`.`wx_legion_activity_order` + ADD COLUMN `cus_merchant_id` bigint NULL AFTER `cus_address`, + ADD COLUMN `cus_legion_id` bigint NULL AFTER `cus_merchant_id`, + ADD COLUMN `cus_union_id` bigint NULL AFTER `cus_legion_id`; + + +update wx_legion_activity_order o + left join wx_legion_activity_user u on o.cus_id = u.id +set o.cus_merchant_id = u.merchant_id,o.cus_legion_id = u.legion_id,o.cus_union_id = u.union_id; + + +ALTER TABLE `mallink`.`wx_legion_activity_order` + MODIFY COLUMN `cus_merchant_id` bigint(20) NOT NULL AFTER `cus_address`, + MODIFY COLUMN `cus_legion_id` bigint(20) NOT NULL AFTER `cus_merchant_id`, + MODIFY COLUMN `cus_union_id` bigint(20) NOT NULL AFTER `cus_legion_id`; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxLegionActivityOrder.java b/mallinkService/src/main/java/com/iformall/domain/po/WxLegionActivityOrder.java index f38eee545..64ef15cd3 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxLegionActivityOrder.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxLegionActivityOrder.java @@ -92,6 +92,13 @@ public class WxLegionActivityOrder extends TenantEntity { @TableField(value = "cus_address") private String cusAddress; + @TableField(value = "cus_merchant_id") + private Long cusMerchantId; + @TableField(value = "cus_legion_id") + private Long cusLegionId; + @TableField(value = "cus_union_id") + private Long cusUnionId; + /** * 商户编号 */ diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/LegionActivityOrderTypeStatistics.java b/mallinkService/src/main/java/com/iformall/domain/vo/LegionActivityOrderTypeStatistics.java index 6a2a9c570..dc1ba6a54 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/LegionActivityOrderTypeStatistics.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/LegionActivityOrderTypeStatistics.java @@ -9,7 +9,7 @@ public class LegionActivityOrderTypeStatistics implements Serializable { private static final long serialVersionUID = 1L; - private Long merchantId; + private Long cusMerchantId; private Integer orderType; private Integer count; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxLegionActivityOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxLegionActivityOrderServiceImpl.java index f6716f747..17fdcf7cf 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxLegionActivityOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxLegionActivityOrderServiceImpl.java @@ -405,7 +405,7 @@ public class WxLegionActivityOrderServiceImpl implements WxLegionActivityOrderSe WxLegionActivityOrder orderQ = new WxLegionActivityOrder(); orderQ.updateTenantInfo(activity); orderQ.setActivityId(activity.getId()); - orderQ.setLegionId(legionId); + orderQ.setCusLegionId(legionId); orderQ.setAuditStatus(EnumLegionActivityOrderStatus.AUDI_SUCCESS.getCode()); List orderTypeStatistics = wxLegionActivityOrderMapper.orderTypeStatistics(orderQ); Integer sign_order = 0,dif_legion = 0,dif_union = 0,eq_union = 0,not_union = 0; @@ -468,8 +468,8 @@ public class WxLegionActivityOrderServiceImpl implements WxLegionActivityOrderSe List merchantStatistics = wxLegionActivityOrderMapper.merchantStatistics(orderQ); Map> merchantStatisticsMap = new HashMap<>(); if(merchantStatistics != null && !merchantStatistics.isEmpty()){ - merchantIds.addAll(merchantStatistics.stream().map(LegionActivityOrderTypeStatistics::getMerchantId).distinct().collect(Collectors.toList())); - merchantStatisticsMap = merchantStatistics.stream().collect(groupingBy(LegionActivityOrderTypeStatistics::getMerchantId)); + merchantIds.addAll(merchantStatistics.stream().map(LegionActivityOrderTypeStatistics::getCusMerchantId).distinct().collect(Collectors.toList())); + merchantStatisticsMap = merchantStatistics.stream().collect(groupingBy(LegionActivityOrderTypeStatistics::getCusMerchantId)); } if(merchantIds.isEmpty()){ return Collections.emptyList(); 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 5d500a5e0..3c706eb19 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java @@ -99,7 +99,7 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity @Override public Map getRecordStatistics(WxOfflineActivityRecord wxOfflineActivityRecord) { - handlerRecordQuery(wxOfflineActivityRecord); + handlerRecordQuery(null,wxOfflineActivityRecord); WxOfflineActivityRecord limitOne = wxOfflineActivityRecordMapper.selectLimitOne(wxOfflineActivityRecord); Map result = new HashMap<>(); Integer audting = 0, audi_success = 0, audt_fail = 0,invalid = 0; @@ -138,14 +138,16 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity @Override public List getRecordList(WxOfflineActivityRecord wxOfflineActivityRecord) { - handlerRecordQuery(wxOfflineActivityRecord); + handlerRecordQuery(null,wxOfflineActivityRecord); List recordList = wxOfflineActivityRecordMapper.findList(wxOfflineActivityRecord); wxOfflineActivityRecordService.handlerRecordList(wxOfflineActivityRecord,wxOfflineActivityRecord.getActivityId(),recordList); return recordList; } - private void handlerRecordQuery(WxOfflineActivityRecord wxOfflineActivityRecord){ - WxOfflineActivity activity = wxOfflineActivityMapper.selectById(wxOfflineActivityRecord.getActivityId(), wxOfflineActivityRecord.getTenantId()); + private void handlerRecordQuery(WxOfflineActivity activity,WxOfflineActivityRecord wxOfflineActivityRecord){ + if(activity == null){ + activity = wxOfflineActivityMapper.selectById(wxOfflineActivityRecord.getActivityId(), wxOfflineActivityRecord.getTenantId()); + } if (activity == null) { wxOfflineActivityRecord.setId(-1l); return; @@ -453,6 +455,7 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity recordQ.setActivityId(activity.getId()); recordQ.setCusPhone(wxOfflineActivityGrantAward.getCusPhone()); recordQ.setAuditStatus(EnumOfflineActivityRecordStatus.AUDI_SUCCESS.getCode()); + handlerRecordQuery(activity,recordQ); List wxOfflineActivityRecords = wxOfflineActivityRecordMapper.findList(recordQ); if (wxOfflineActivityRecords == null || wxOfflineActivityRecords.isEmpty()) { throw new MallinkException(Result.ERROR, "未查询到活动订单"); @@ -802,7 +805,7 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity @Override public void recordExport(HttpServletRequest request, HttpServletResponse response, WxOfflineActivityRecord wxOfflineActivityRecord) { - handlerRecordQuery(wxOfflineActivityRecord); + handlerRecordQuery(null,wxOfflineActivityRecord); List recordList = wxOfflineActivityRecordMapper.findList(wxOfflineActivityRecord); wxOfflineActivityRecordService.handlerRecordList(wxOfflineActivityRecord,wxOfflineActivityRecord.getActivityId(),recordList); excelService.exportExcel(recordList, null, "用户参加活动订单列表", WxOfflineActivityRecord.class, "用户参加活动订单列表.xlsx", response, false); diff --git a/mallinkService/src/main/resources/mapper/WxLegionActivityOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxLegionActivityOrderMapper.xml index ddb55e674..b87eeda6a 100644 --- a/mallinkService/src/main/resources/mapper/WxLegionActivityOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxLegionActivityOrderMapper.xml @@ -14,6 +14,9 @@ + + + @@ -31,6 +34,7 @@ id,tenant_id,parent_tenant_id, activity_id,order_no,order_money, cus_id,cus_name,cus_address, + cus_merchant_id,cus_legion_id,cus_union_id, merchant_id,legion_id,union_id, order_type,create_by,create_date, update_date,audit_remark,audit_status, @@ -233,11 +237,11 @@ and `activity_id` = #{activityId} - - and `legion_id` = #{legionId} + + and `cus_legion_id` = #{cusLegionId} - - and `merchant_id` = #{merchantId} + + and `cus_merchant_id` = #{cusMerchantId} and `audit_status` = #{auditStatus} @@ -247,7 +251,7 @@