Explorar el Código

fix bug

release_toaliyun_real
winter hace 2 años
padre
commit
0769824222
Se han modificado 1 ficheros con 2 adiciones y 2 borrados
  1. +2
    -2
      mallinkBApi/src/main/java/com/iformall/controller/WxCashBackActivityController.java

+ 2
- 2
mallinkBApi/src/main/java/com/iformall/controller/WxCashBackActivityController.java Ver fichero

@@ -107,7 +107,7 @@ public class WxCashBackActivityController extends BaseController {
if (null == wxCashBackActivityRecord) wxCashBackActivityRecord = new WxCashBackActivityRecord(); if (null == wxCashBackActivityRecord) wxCashBackActivityRecord = new WxCashBackActivityRecord();
TenantEntity tenantInfo = getTenantInfo(); TenantEntity tenantInfo = getTenantInfo();
wxCashBackActivityRecord.updateTenantInfo(tenantInfo); wxCashBackActivityRecord.updateTenantInfo(tenantInfo);
wxCashBackActivityRecord.setMerchantId(getMerchantBUserId());
wxCashBackActivityRecord.setMerchantId(getLoginBUser().getMerchantId());
wxCashBackActivityRecord.setSortColumns(SortField.CreateDate_DESC); wxCashBackActivityRecord.setSortColumns(SortField.CreateDate_DESC);
final PageInfo<WxCashBackActivityRecord> page = wxCashBackActivityService.listActivityRecordAsPage(wxCashBackActivityRecord, pageNum, pageSize); final PageInfo<WxCashBackActivityRecord> page = wxCashBackActivityService.listActivityRecordAsPage(wxCashBackActivityRecord, pageNum, pageSize);
return new ResultData(page); return new ResultData(page);
@@ -157,7 +157,7 @@ public class WxCashBackActivityController extends BaseController {
WxCashBackActivityRecord r = new WxCashBackActivityRecord(); WxCashBackActivityRecord r = new WxCashBackActivityRecord();
r.setActivityId(a.getId()); r.setActivityId(a.getId());
r.updateTenantInfo(a); r.updateTenantInfo(a);
r.setMerchantId(getMerchantBUserId());
r.setMerchantId(getLoginBUser().getMerchantId());
int allRecordCount = wxCashBackActivityService.getRecordCount(r); int allRecordCount = wxCashBackActivityService.getRecordCount(r);
r.setAuditStatus(EnumCashBackActivityRecordStatus.AUDI_SUCCESS.getCode()); r.setAuditStatus(EnumCashBackActivityRecordStatus.AUDI_SUCCESS.getCode());


Cargando…
Cancelar
Guardar