Przeglądaj źródła

fix bug

release_toaliyun_real
winter 2 lat temu
rodzic
commit
0769824222
1 zmienionych plików z 2 dodań i 2 usunięć
  1. +2
    -2
      mallinkBApi/src/main/java/com/iformall/controller/WxCashBackActivityController.java

+ 2
- 2
mallinkBApi/src/main/java/com/iformall/controller/WxCashBackActivityController.java Wyświetl plik

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


Ładowanie…
Anuluj
Zapisz