| @@ -82,9 +82,9 @@ public class WxRaffleActivityRecord extends TenantEntity { | |||||
| StringBuffer sb = new StringBuffer(); | StringBuffer sb = new StringBuffer(); | ||||
| for (int i = 0 ; i < recordItemList.size() ; i++) { | for (int i = 0 ; i < recordItemList.size() ; i++) { | ||||
| WxRaffleActivityRecordItem ri = recordItemList.get(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(); | return sb.toString(); | ||||
| } | } | ||||
| @@ -20,7 +20,7 @@ public interface WxRaffleActivityRecordItemMapper extends CommonMapper<WxRaffleA | |||||
| BigDecimal sumMerchant(WxRaffleActivityRecordItem wxCashBackActivity); | BigDecimal sumMerchant(WxRaffleActivityRecordItem wxCashBackActivity); | ||||
| List<Map> selectMerchantRecords(WxRaffleActivityRecordItem wxCashBackActivity); | |||||
| void deleteByRecordId(WxRaffleActivityRecordItem wxCashBackActivity); | void deleteByRecordId(WxRaffleActivityRecordItem wxCashBackActivity); | ||||
| @@ -2,6 +2,8 @@ package com.iformall.mapper; | |||||
| import com.iformall.common.CommonMapper; | import com.iformall.common.CommonMapper; | ||||
| import com.iformall.domain.po.WxRaffleActivityRecord; | import com.iformall.domain.po.WxRaffleActivityRecord; | ||||
| import com.iformall.domain.po.WxRaffleActivityRecordItem; | |||||
| import org.apache.ibatis.annotations.Param; | import org.apache.ibatis.annotations.Param; | ||||
| import java.math.BigDecimal; | import java.math.BigDecimal; | ||||
| import java.util.List; | import java.util.List; | ||||
| @@ -17,6 +19,8 @@ public interface WxRaffleActivityRecordMapper extends CommonMapper<WxRaffleActiv | |||||
| BigDecimal sumOrderMoney(WxRaffleActivityRecord wxCashBackActivity); | BigDecimal sumOrderMoney(WxRaffleActivityRecord wxCashBackActivity); | ||||
| List<Map> selectMerchantRecords(WxRaffleActivityRecord wxCashBackActivity); | |||||
| void updateStatus(WxRaffleActivityRecord wxCashBackActivity); | void updateStatus(WxRaffleActivityRecord wxCashBackActivity); | ||||
| Integer selectCount(WxRaffleActivityRecord wxCashBackActivity); | Integer selectCount(WxRaffleActivityRecord wxCashBackActivity); | ||||
| @@ -442,7 +442,17 @@ public class WxRaffleActivityServiceImpl implements WxRaffleActivityService { | |||||
| @Override | @Override | ||||
| public List<Map> getMerchantRecords(WxRaffleActivityRecord record) { | public List<Map> getMerchantRecords(WxRaffleActivityRecord record) { | ||||
| initRecordQueryParam(record); | initRecordQueryParam(record); | ||||
| return wxActivityRecordItemMapper.selectMerchantRecords(generateItemByRecordQuery(record)); | |||||
| List<Map> 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 | @Override | ||||
| @@ -107,13 +107,6 @@ | |||||
| <include refid="dynamicWhereConditions" /> | <include refid="dynamicWhereConditions" /> | ||||
| </select> | </select> | ||||
| <select id="selectMerchantRecords" parameterType="com.iformall.domain.po.WxRaffleActivityRecordItem" resultType="java.util.HashMap"> | |||||
| select merchant_id as merchantId,count(distint record_id) as orderCount, sum(cash_money) as allMoney, | |||||
| sum(merchant_cash_money) as merchantMenoy from wx_raffle_activity_record_item | |||||
| <include refid="dynamicWhereConditions" /> | |||||
| group by merchant_id | |||||
| </select> | |||||
| <delete id = "deleteByRecordId"> | <delete id = "deleteByRecordId"> | ||||
| delete from wx_raffle_activity_record_item <include refid="dynamicWhereConditions" /> | delete from wx_raffle_activity_record_item <include refid="dynamicWhereConditions" /> | ||||
| </delete> | </delete> | ||||
| @@ -136,5 +136,11 @@ | |||||
| select sum(order_money) from wx_raffle_activity_record | select sum(order_money) from wx_raffle_activity_record | ||||
| <include refid="dynamicWhereConditions" /> | <include refid="dynamicWhereConditions" /> | ||||
| </select> | </select> | ||||
| <select id="selectMerchantRecords" parameterType="com.iformall.domain.po.WxRaffleActivityRecord" resultType="java.util.HashMap"> | |||||
| select merchant_id as merchantId,count(1) as orderCount,sum(order_money) as orderMoney from wx_raffle_activity_record | |||||
| <include refid="dynamicWhereConditions" /> | |||||
| group by merchant_id | |||||
| </select> | |||||
| </mapper> | </mapper> | ||||