Przeglądaj źródła

fix

release_toaliyun_real
winter 2 lat temu
rodzic
commit
15cd55690e
5 zmienionych plików z 8 dodań i 9 usunięć
  1. +0
    -2
      mallinkService/src/main/java/com/iformall/mapper/WxRaffleActivityRecordItemMapper.java
  2. +2
    -1
      mallinkService/src/main/java/com/iformall/mapper/WxRaffleActivityRecordMapper.java
  3. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxRaffleActivityServiceImpl.java
  4. +0
    -5
      mallinkService/src/main/resources/mapper/WxRaffleActivityRecordItemMapper.xml
  5. +5
    -0
      mallinkService/src/main/resources/mapper/WxRaffleActivityRecordMapper.xml

+ 0
- 2
mallinkService/src/main/java/com/iformall/mapper/WxRaffleActivityRecordItemMapper.java Wyświetl plik

@@ -20,8 +20,6 @@ public interface WxRaffleActivityRecordItemMapper extends CommonMapper<WxRaffleA
BigDecimal sumMerchant(WxRaffleActivityRecordItem wxCashBackActivity); BigDecimal sumMerchant(WxRaffleActivityRecordItem wxCashBackActivity);
BigDecimal sumOrderMoney(WxRaffleActivityRecordItem wxCashBackActivity);
List<Map> selectMerchantRecords(WxRaffleActivityRecordItem wxCashBackActivity); List<Map> selectMerchantRecords(WxRaffleActivityRecordItem wxCashBackActivity);
void deleteByRecordId(WxRaffleActivityRecordItem wxCashBackActivity); void deleteByRecordId(WxRaffleActivityRecordItem wxCashBackActivity);


+ 2
- 1
mallinkService/src/main/java/com/iformall/mapper/WxRaffleActivityRecordMapper.java Wyświetl plik

@@ -2,7 +2,6 @@ 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 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;
@@ -16,6 +15,8 @@ public interface WxRaffleActivityRecordMapper extends CommonMapper<WxRaffleActiv
List<Long> findIdList(WxRaffleActivityRecord wxCashBackActivity); List<Long> findIdList(WxRaffleActivityRecord wxCashBackActivity);
BigDecimal sumOrderMoney(WxRaffleActivityRecord wxCashBackActivity);
void updateStatus(WxRaffleActivityRecord wxCashBackActivity); void updateStatus(WxRaffleActivityRecord wxCashBackActivity);
Integer selectCount(WxRaffleActivityRecord wxCashBackActivity); Integer selectCount(WxRaffleActivityRecord wxCashBackActivity);


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxRaffleActivityServiceImpl.java Wyświetl plik

@@ -277,7 +277,7 @@ public class WxRaffleActivityServiceImpl implements WxRaffleActivityService {
@Override @Override
public BigDecimal getRecordOrderMoneySum(WxRaffleActivityRecord record) { public BigDecimal getRecordOrderMoneySum(WxRaffleActivityRecord record) {
return wxActivityRecordItemMapper.sumOrderMoney(generateItemByRecordQuery(record));
return wxActivityRecordMapper.sumOrderMoney(record);
} }


@Override @Override


+ 0
- 5
mallinkService/src/main/resources/mapper/WxRaffleActivityRecordItemMapper.xml Wyświetl plik

@@ -107,11 +107,6 @@
<include refid="dynamicWhereConditions" /> <include refid="dynamicWhereConditions" />
</select> </select>
<select id="sumOrderMoney" parameterType="com.iformall.domain.po.WxRaffleActivityRecordItem" resultType="BigDecimal">
select sum(order_money) from wx_raffle_activity_record_item
<include refid="dynamicWhereConditions" />
</select>
<select id="selectMerchantRecords" parameterType="com.iformall.domain.po.WxRaffleActivityRecordItem" resultType="java.util.HashMap"> <select id="selectMerchantRecords" parameterType="com.iformall.domain.po.WxRaffleActivityRecordItem" resultType="java.util.HashMap">
select merchant_id as merchantId,count(1) as orderCount, sum(cash_money) as allMoney, select merchant_id as merchantId,count(1) as orderCount, sum(cash_money) as allMoney,
sum(merchant_cash_money) as merchantMenoy from wx_raffle_activity_record_item sum(merchant_cash_money) as merchantMenoy from wx_raffle_activity_record_item


+ 5
- 0
mallinkService/src/main/resources/mapper/WxRaffleActivityRecordMapper.xml Wyświetl plik

@@ -131,5 +131,10 @@
select count(1) from wx_raffle_activity_record select count(1) from wx_raffle_activity_record
<include refid="dynamicWhereConditions" /> <include refid="dynamicWhereConditions" />
</select> </select>
<select id="sumOrderMoney" parameterType="com.iformall.domain.po.WxRaffleActivityRecord" resultType="BigDecimal">
select sum(order_money) from wx_raffle_activity_record
<include refid="dynamicWhereConditions" />
</select>


</mapper> </mapper>

Ładowanie…
Anuluj
Zapisz