Explorar el Código

fix

release_toaliyun_real
winter hace 2 años
padre
commit
15637944f1
Se han modificado 2 ficheros con 5 adiciones y 1 borrados
  1. +4
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxRaffleActivityController.java
  2. +1
    -1
      mallinkBApi/src/main/java/com/iformall/controller/WxRaffleActivityController.java

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

@@ -268,6 +268,10 @@ public class WxRaffleActivityController extends BaseController {
activity.setActivityName(a.getName());
}
}
List<Long> aids = new ArrayList<Long>();;
aids.add(activity.getActivityId());
activity.setRecordItemList(wxCashBackActivityService.getActivityRecordItemListByRecordId(aids, id, tenantInfo));
activity.setItemDetail(activity.generateItemDetaiJson());
if (null != activity.getMerchantId()) {
WxMerchant m = new WxMerchant();


+ 1
- 1
mallinkBApi/src/main/java/com/iformall/controller/WxRaffleActivityController.java Ver fichero

@@ -134,7 +134,7 @@ public class WxRaffleActivityController extends BaseController {
List<Long> aids = new ArrayList<Long>();;
aids.add(activity.getActivityId());
activity.setRecordItemList(wxCashBackActivityService.getActivityRecordItemListByRecordId(aids, id, tenantInfo));
activity.setItemDetail(activity.generateItemDetaiJson());
if (null != activity.getMerchantId()) {
WxMerchant m = new WxMerchant();
m.updateTenantInfo(activity);


Cargando…
Cancelar
Guardar