|
|
@ -24,7 +24,6 @@ import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
import org.springframework.beans.factory.annotation.Value; |
|
|
|
import org.springframework.http.ResponseEntity; |
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
import org.springframework.web.bind.annotation.RequestPart; |
|
|
|
import org.springframework.web.client.RestTemplate; |
|
|
|
import org.springframework.web.multipart.MultipartFile; |
|
|
|
|
|
|
@ -94,7 +93,7 @@ public class LpkCustomerService extends MybatisBaseService<LpkCustomerMapper, Lp |
|
|
|
if (!jsonObject.containsKey("openid")) { |
|
|
|
return rb.setMsg("未获得openid,请联系管理员"); |
|
|
|
} |
|
|
|
// String unionid = jsonObject.get("unionid").toString();
|
|
|
|
String unionid = jsonObject.get("unionid").toString(); |
|
|
|
String openid = jsonObject.get("openid").toString(); |
|
|
|
Map<String, String> map = new HashMap<>(); |
|
|
|
// map.put("unionid",unionid);
|
|
|
@ -106,7 +105,7 @@ public class LpkCustomerService extends MybatisBaseService<LpkCustomerMapper, Lp |
|
|
|
//新增用户
|
|
|
|
LpkCustomer newCustomer = new LpkCustomer(); |
|
|
|
newCustomer.setWxMpOpenid(openid); |
|
|
|
// newCustomer.setUnionId(unionid);
|
|
|
|
newCustomer.setUnionId(unionid); |
|
|
|
newCustomer.setCreateTime(new Date()); |
|
|
|
newCustomer.setIsPurchase("1"); |
|
|
|
newCustomer.setIsNewUser("1"); |
|
|
@ -136,6 +135,10 @@ public class LpkCustomerService extends MybatisBaseService<LpkCustomerMapper, Lp |
|
|
|
baseMapper.updateById(lpkCustomer); |
|
|
|
lpkCustomer = fetchBySid(lpkCustomer.getSid()); |
|
|
|
} |
|
|
|
if(StringUtils.isBlank(lpkCustomer.getUnionId())){ |
|
|
|
lpkCustomer.setUnionId(unionid); |
|
|
|
baseMapper.updateById(lpkCustomer); |
|
|
|
} |
|
|
|
StpUtil.login(lpkCustomer.getId()); |
|
|
|
SaTokenInfo tokenInfo = StpUtil.getTokenInfo(); |
|
|
|
lpkCustomer.setToken(tokenInfo.getTokenValue()); |
|
|
|