| @@ -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); | ||||
| } | } | ||||
| @@ -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); | ||||
| @@ -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} | ||||