Procházet zdrojové kódy

//OfflineActivity

release_toaliyun_real
xiaohu před 1 rokem
rodič
revize
84c70e9942
3 změnil soubory, kde provedl 5 přidání a 5 odebrání
  1. +2
    -3
      mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantSettlementServiceImpl.java
  2. +1
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityRecordServiceImpl.java
  3. +2
    -2
      mallinkService/src/main/resources/mapper/WxOfflineActivityGrantAwardMapper.xml

+ 2
- 3
mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantSettlementServiceImpl.java Zobrazit soubor

@@ -62,9 +62,8 @@ public class WxOfflineActivityGrantSettlementServiceImpl implements WxOfflineAct
for(int i=0; i<size; i++){ for(int i=0; i<size; i++){
WxOfflineActivityRecord record = recordDescList.get(i); WxOfflineActivityRecord record = recordDescList.get(i);
BigDecimal orderRatio = record.getOrderMoney() BigDecimal orderRatio = record.getOrderMoney()
.divide(wxOfflineActivityGrantAward.getOrderMoneySum())
.multiply(new BigDecimal(100))
.setScale(2, RoundingMode.HALF_UP);
.divide(wxOfflineActivityGrantAward.getOrderMoneySum(),4,RoundingMode.HALF_UP)
.multiply(new BigDecimal(100));
record.setOrderRatio(orderRatio); record.setOrderRatio(orderRatio);
lastRatio = lastRatio.subtract(orderRatio); lastRatio = lastRatio.subtract(orderRatio);
} }


+ 1
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityRecordServiceImpl.java Zobrazit soubor

@@ -130,6 +130,7 @@ public class WxOfflineActivityRecordServiceImpl implements WxOfflineActivityReco
wxOfflineActivityRecordMapper.insert(wxOfflineActivityRecord); wxOfflineActivityRecordMapper.insert(wxOfflineActivityRecord);
} }
else{ else{
wxOfflineActivityRecord.setAuditRemark("");
wxOfflineActivityRecord.setAuditStatus(EnumOfflineActivityRecordStatus.AUDTING.getCode()); wxOfflineActivityRecord.setAuditStatus(EnumOfflineActivityRecordStatus.AUDTING.getCode());
wxOfflineActivityRecord.setUpdateDate(now); wxOfflineActivityRecord.setUpdateDate(now);
wxOfflineActivityRecordMapper.updateById(wxOfflineActivityRecord); wxOfflineActivityRecordMapper.updateById(wxOfflineActivityRecord);


+ 2
- 2
mallinkService/src/main/resources/mapper/WxOfflineActivityGrantAwardMapper.xml Zobrazit soubor

@@ -96,8 +96,8 @@


<select id="getRecordIdList" parameterType="com.iformall.domain.po.WxOfflineActivityGrantAward" resultType="Long"> <select id="getRecordIdList" parameterType="com.iformall.domain.po.WxOfflineActivityGrantAward" resultType="Long">
SELECT DISTINCT rg.record_id SELECT DISTINCT rg.record_id
FROM wx_offline_activity_grant_award ga
left join wx_offline_activity_record_grant rg
from wx_offline_activity_record_grant rg
left join wx_offline_activity_grant_award ga on ga.id = rg.grant_id
where 1 = 1 where 1 = 1
<if test=" null != tenantId and '' != tenantId"> <if test=" null != tenantId and '' != tenantId">
and ga.`tenant_id` = #{tenantId} and ga.`tenant_id` = #{tenantId}


Načítá se…
Zrušit
Uložit