diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java index 8bdd6397a..2a2a157ad 100755 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java @@ -946,6 +946,8 @@ public class WxUserGrantController extends BaseController { record.setAddress(wxCUserBasicInfo.getAddress()); record.setUpdateDate(new Date()); record.setFinalTenantId(tenantEntity.getFinalTenantId()); + record.setChildrenList(wxCUserBasicInfo.getChildrenList()); + record.setUpdChild(true); wxCUserBasicInfoService.update(record); wxScoreRulesService.addScore(tenantEntity,EnumScoreType.COMPLETE_INFO, record); //增加积分 diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java index f72f07bac..4563715be 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java @@ -130,6 +130,9 @@ public class WxCUserBasicInfo extends TenantEntityWithoutFinalTenantId { @TableField(exist = false) private List childrenList; + @TableField(exist = false) + private boolean updChild = false; + @TableField(exist = false) private String tagIds; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java index 7f462cb86..c8fe9ecd5 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java @@ -642,6 +642,9 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc @Override public void update(WxCUserBasicInfo record) { + if(record.isUpdChild()){ + + } wxCUserBasicInfoMapper.updateById(record); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java index 9e58e0885..feacfb712 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java @@ -235,13 +235,13 @@ public class WxGameServiceImpl implements WxGameService { JSONObject couponChanObj = (JSONObject) couponChannelIds.get(i); Integer prizeType = couponChanObj.getInteger("prizeType"); if(prizeType != null && prizeType == Constant.creditPlayType){ - Map map = new HashMap<>(); - map.put("prizeType",Constant.creditPlayType); - map.put("gameWeight",couponChanObj.getInteger("weight")); - map.put("credit",couponChanObj.getInteger("credit")); - map.put("id",couponChanObj.getLong("id")); -// map.put("couponId",couponChanObj.getLong("couponId")); - couponIdsList.add(map); +// Map jsonToMap = JSONObject.parseObject(couponChanObj.toJSONString()); +// Map map = new HashMap<>(); +// map.put("prizeType",Constant.creditPlayType); +// map.put("gameWeight",couponChanObj.getInteger("weight")); +// map.put("credit",couponChanObj.getInteger("credit")); +// map.put("id",couponChanObj.getLong("id")); + couponIdsList.add(couponChanObj); }else{ Long couponId = couponChanObj.getLong("couponId"); @@ -331,7 +331,6 @@ public class WxGameServiceImpl implements WxGameService { Integer prizeType = obj.getInteger("prizeType"); if(prizeType == null || prizeType != Constant.creditPlayType){ Long couponId = obj.getLong("couponId"); - int weight = obj.getIntValue("weight"); try { if(couponId != null){ saveOrUpdateCouponChannel(couponId, wxCouponChannelsMap, record);