xhxu 5 лет назад
Родитель
Сommit
f918961e56
4 измененных файлов: 15 добавлений и 8 удалений
  1. +2
    -0
      mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java
  2. +3
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java
  3. +3
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java
  4. +7
    -8
      mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java

+ 2
- 0
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);
//增加积分


+ 3
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java Просмотреть файл

@@ -130,6 +130,9 @@ public class WxCUserBasicInfo extends TenantEntityWithoutFinalTenantId {
@TableField(exist = false)
private List<WxCUserBasicChild> childrenList;

@TableField(exist = false)
private boolean updChild = false;

@TableField(exist = false)
private String tagIds;



+ 3
- 0
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);
}



+ 7
- 8
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<String,Object> 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<String,Object> 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);


Загрузка…
Отмена
Сохранить