From 716d663f6573fed40e2b11fec05a1150d0963b2a Mon Sep 17 00:00:00 2001 From: winter Date: Sat, 30 Mar 2024 19:01:06 +0800 Subject: [PATCH] fix --- .../iformall/domain/po/WxRaffleActivityRecord.java | 6 +++--- .../mapper/WxRaffleActivityRecordItemMapper.java | 2 +- .../mapper/WxRaffleActivityRecordMapper.java | 4 ++++ .../service/impl/WxRaffleActivityServiceImpl.java | 12 +++++++++++- .../mapper/WxRaffleActivityRecordItemMapper.xml | 7 ------- .../mapper/WxRaffleActivityRecordMapper.xml | 6 ++++++ 6 files changed, 25 insertions(+), 12 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxRaffleActivityRecord.java b/mallinkService/src/main/java/com/iformall/domain/po/WxRaffleActivityRecord.java index 010a2e149..428ae4f98 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxRaffleActivityRecord.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxRaffleActivityRecord.java @@ -82,9 +82,9 @@ public class WxRaffleActivityRecord extends TenantEntity { StringBuffer sb = new StringBuffer(); for (int i = 0 ; i < recordItemList.size() ; i++) { WxRaffleActivityRecordItem ri = recordItemList.get(i); - sb.append("奖项[").append(i+1).append("]:奖券编码-").append(ri.getCode()).append(",奖项-").append(ri.getItemName()).append(",总价值-") - .append(ri.getCashMoney()).append(",商管承担-").append(ri.getMallCashMoney()).append("元(").append(ri.getMallRate()).append("%),") - .append("商户承担-").append(ri.getMerchantCashMoney()).append("元(").append(ri.getMerchantRate()).append("%). \n"); + sb.append("编码[").append(ri.getCode()).append("]对应奖项[").append(ri.getItemName()).append("],总价值[") + .append(ri.getCashMoney()).append("],商管承担[").append(ri.getMallCashMoney()).append("元(").append(ri.getMallRate()).append("%)],") + .append("商户承担[").append(ri.getMerchantCashMoney()).append("元(").append(ri.getMerchantRate()).append("%)]. \n"); } return sb.toString(); } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxRaffleActivityRecordItemMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxRaffleActivityRecordItemMapper.java index 2232ba6b7..0d28cbd1c 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxRaffleActivityRecordItemMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxRaffleActivityRecordItemMapper.java @@ -20,7 +20,7 @@ public interface WxRaffleActivityRecordItemMapper extends CommonMapper selectMerchantRecords(WxRaffleActivityRecordItem wxCashBackActivity); + void deleteByRecordId(WxRaffleActivityRecordItem wxCashBackActivity); diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxRaffleActivityRecordMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxRaffleActivityRecordMapper.java index 826db607e..1ba013958 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxRaffleActivityRecordMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxRaffleActivityRecordMapper.java @@ -2,6 +2,8 @@ package com.iformall.mapper; import com.iformall.common.CommonMapper; import com.iformall.domain.po.WxRaffleActivityRecord; +import com.iformall.domain.po.WxRaffleActivityRecordItem; + import org.apache.ibatis.annotations.Param; import java.math.BigDecimal; import java.util.List; @@ -17,6 +19,8 @@ public interface WxRaffleActivityRecordMapper extends CommonMapper selectMerchantRecords(WxRaffleActivityRecord wxCashBackActivity); + void updateStatus(WxRaffleActivityRecord wxCashBackActivity); Integer selectCount(WxRaffleActivityRecord wxCashBackActivity); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRaffleActivityServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRaffleActivityServiceImpl.java index b7d8be29e..763a4aac1 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRaffleActivityServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRaffleActivityServiceImpl.java @@ -442,7 +442,17 @@ public class WxRaffleActivityServiceImpl implements WxRaffleActivityService { @Override public List getMerchantRecords(WxRaffleActivityRecord record) { initRecordQueryParam(record); - return wxActivityRecordItemMapper.selectMerchantRecords(generateItemByRecordQuery(record)); + List rlist = wxActivityRecordMapper.selectMerchantRecords(record); + if (null != rlist && rlist.size() > 0 ) { + for (int i = 0 ; i < rlist.size(); i++) { + Map r = rlist.get(i); + WxRaffleActivityRecordItem ri = generateItemByRecordQuery(record); + r.put("allMoney", wxActivityRecordItemMapper.sumAll(ri)); + r.put("merchantMenoy", wxActivityRecordItemMapper.sumMerchant(ri)); + + } + } + return rlist; } @Override diff --git a/mallinkService/src/main/resources/mapper/WxRaffleActivityRecordItemMapper.xml b/mallinkService/src/main/resources/mapper/WxRaffleActivityRecordItemMapper.xml index 9454b1c07..a78ee4d4b 100644 --- a/mallinkService/src/main/resources/mapper/WxRaffleActivityRecordItemMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRaffleActivityRecordItemMapper.xml @@ -107,13 +107,6 @@ - - delete from wx_raffle_activity_record_item diff --git a/mallinkService/src/main/resources/mapper/WxRaffleActivityRecordMapper.xml b/mallinkService/src/main/resources/mapper/WxRaffleActivityRecordMapper.xml index d113f217a..22a702522 100644 --- a/mallinkService/src/main/resources/mapper/WxRaffleActivityRecordMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRaffleActivityRecordMapper.xml @@ -136,5 +136,11 @@ select sum(order_money) from wx_raffle_activity_record + + \ No newline at end of file