提交 0f0acc77 authored 作者: 窦馨雨's avatar 窦馨雨

合并分支 'dxy' 到 'qa'

CP计划小程序改造,老用户修改信息兼容 查看合并请求 !75
...@@ -11,6 +11,7 @@ import com.wangxiaolu.promotion.pojo.user.vo.WxTemporaryEnrollVo; ...@@ -11,6 +11,7 @@ import com.wangxiaolu.promotion.pojo.user.vo.WxTemporaryEnrollVo;
import com.wangxiaolu.promotion.result.basedata.R; import com.wangxiaolu.promotion.result.basedata.R;
import com.wangxiaolu.promotion.result.basedata.RCode; import com.wangxiaolu.promotion.result.basedata.RCode;
import com.wangxiaolu.promotion.service.wechat.WeChatUserCoreService; import com.wangxiaolu.promotion.service.wechat.WeChatUserCoreService;
import com.wangxiaolu.promotion.service.wechat.WeChatUserQueryService;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -19,6 +20,7 @@ import org.springframework.web.bind.annotation.*; ...@@ -19,6 +20,7 @@ import org.springframework.web.bind.annotation.*;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.Map;
/** /**
* @author : liqiulin * @author : liqiulin
...@@ -33,6 +35,8 @@ public class TemporaryInfoCoreController { ...@@ -33,6 +35,8 @@ public class TemporaryInfoCoreController {
@Autowired @Autowired
private WeChatUserCoreService weChatUserCoreService; private WeChatUserCoreService weChatUserCoreService;
@Autowired @Autowired
private WeChatUserQueryService weChatUserQueryService;
@Autowired
private RedisCache redisCache; private RedisCache redisCache;
@Autowired @Autowired
private EnvUtil envUtil; private EnvUtil envUtil;
...@@ -75,6 +79,13 @@ public class TemporaryInfoCoreController { ...@@ -75,6 +79,13 @@ public class TemporaryInfoCoreController {
if (wxTemporaryEnrollVo.getOpenId() == null) { if (wxTemporaryEnrollVo.getOpenId() == null) {
throw new ParamException(RCode.WX_OPENID_PARAM_ERROR, null); throw new ParamException(RCode.WX_OPENID_PARAM_ERROR, null);
} }
Map<String, Object> temporaryWorkStore = weChatUserQueryService.findTemporaryWorkStore(wxTemporaryEnrollVo.getOpenId(), LocalDate.now().toString());
if (temporaryWorkStore.get("storeName") == null || temporaryWorkStore.get("storeCode") == null ) {
WxTemporaryInfoDto temporaryDto = new WxTemporaryInfoDto();
BeanUtils.copyProperties(wxTemporaryEnrollVo, temporaryDto);
weChatUserCoreService.saveWxUserStoreInfoTemporary(temporaryDto);
}
// 转换为延迟表实体 // 转换为延迟表实体
WxTemporaryInfoDelayDtO delayEntity = new WxTemporaryInfoDelayDtO(); WxTemporaryInfoDelayDtO delayEntity = new WxTemporaryInfoDelayDtO();
BeanUtils.copyProperties(wxTemporaryEnrollVo, delayEntity); BeanUtils.copyProperties(wxTemporaryEnrollVo, delayEntity);
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论