Explorar el Código

fix

release_toaliyun_real
winter hace 2 años
padre
commit
b551545a93
Se han modificado 2 ficheros con 9 adiciones y 6 borrados
  1. +3
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxRaffleActivityController.java
  2. +6
    -6
      mallinkService/src/main/java/com/iformall/service/impl/WxRaffleActivityServiceImpl.java

+ 3
- 0
mallinkAdmin/src/main/java/com/iformall/controller/market/WxRaffleActivityController.java Ver fichero

@@ -325,6 +325,9 @@ public class WxRaffleActivityController extends BaseController {
public ResultData calRecordMoney(@RequestBody WxRaffleActivityRecordItem wxCashBackActivityRecord) { public ResultData calRecordMoney(@RequestBody WxRaffleActivityRecordItem wxCashBackActivityRecord) {
TenantEntity tenantEntity = getTenantInfo(); TenantEntity tenantEntity = getTenantInfo();
wxCashBackActivityRecord.updateTenantInfo(tenantEntity); wxCashBackActivityRecord.updateTenantInfo(tenantEntity);
if (null == wxCashBackActivityRecord.getItemId() || null == wxCashBackActivityRecord.getItemSize()) {
return new ResultData(Result.ERROR,"请选择选项和数量");
}
wxCashBackActivityService.calcuteMoney(wxCashBackActivityRecord); wxCashBackActivityService.calcuteMoney(wxCashBackActivityRecord);
return new ResultData(wxCashBackActivityRecord); return new ResultData(wxCashBackActivityRecord);
} }


+ 6
- 6
mallinkService/src/main/java/com/iformall/service/impl/WxRaffleActivityServiceImpl.java Ver fichero

@@ -473,15 +473,15 @@ public class WxRaffleActivityServiceImpl implements WxRaffleActivityService {
final IdWorker idWorker = IdWorker.get(); final IdWorker idWorker = IdWorker.get();
for (int i = 0 ;i < record.getRecordItemList().size() ; i ++) { for (int i = 0 ;i < record.getRecordItemList().size() ; i ++) {
WxRaffleActivityRecordItem _ri = record.getRecordItemList().get(i); WxRaffleActivityRecordItem _ri = record.getRecordItemList().get(i);
_ri.setId(idWorker.nextId());
_ri.setActivityId(r.getActivityId());
_ri.setMerchantId(r.getMerchantId());
_ri.setRecordId(r.getId());
_ri.updateTenantInfo(r);
if (null != ri.getItemId()) { if (null != ri.getItemId()) {
_ri.setId(idWorker.nextId());
_ri.setActivityId(r.getActivityId());
_ri.setMerchantId(r.getMerchantId());
_ri.setRecordId(r.getId());
_ri.updateTenantInfo(r);
calcuteMoney(_ri); calcuteMoney(_ri);
wxActivityRecordItemMapper.insert(_ri);
} }
wxActivityRecordItemMapper.insert(_ri);
} }
} }
} }


Cargando…
Cancelar
Guardar