Sfoglia il codice sorgente

fix

release_toaliyun_real
winter 2 anni fa
parent
commit
c75f9b8424
2 ha cambiato i file con 1 aggiunte e 2 eliminazioni
  1. +1
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCashBackActivityController.java
  2. +0
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxCashBackActivityServiceImpl.java

+ 1
- 0
mallinkAdmin/src/main/java/com/iformall/controller/market/WxCashBackActivityController.java Vedi File

@@ -371,6 +371,7 @@ public class WxCashBackActivityController extends BaseController {
r.setActivityId(a.getId()); r.setActivityId(a.getId());
r.updateTenantInfo(a); r.updateTenantInfo(a);
r.setMerchantId(wxCashBackActivityRecord.getMerchantId()); r.setMerchantId(wxCashBackActivityRecord.getMerchantId());
r.setAuditStatus(EnumCashBackActivityRecordStatus.AUDI_SUCCESS.getCode());
int allRecordCount = wxCashBackActivityService.getRecordCount(r); int allRecordCount = wxCashBackActivityService.getRecordCount(r);
BigDecimal orderMoneySum = wxCashBackActivityService.getRecordOrderMoneySum(r); BigDecimal orderMoneySum = wxCashBackActivityService.getRecordOrderMoneySum(r);
BigDecimal recordSum = wxCashBackActivityService.getRecordSum(r); BigDecimal recordSum = wxCashBackActivityService.getRecordSum(r);


+ 0
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxCashBackActivityServiceImpl.java Vedi File

@@ -190,8 +190,6 @@ public class WxCashBackActivityServiceImpl implements WxCashBackActivityService
WxCashBackActivityItem _i = itemMap.get(_r.getItemId()); WxCashBackActivityItem _i = itemMap.get(_r.getItemId());
if (null != _i) { if (null != _i) {
_r.setItemName(_i.getName()); _r.setItemName(_i.getName());
_r.setMallRate(_i.getMallBackRate());
_r.setMerchantRate(_i.getMerchantBackRate());
} }
} }
} }


Caricamento…
Annulla
Salva