|
@@ -478,43 +478,52 @@ public class PayController {
|
|
|
req.put("msg","修改订单状态成功");
|
|
|
logger.info(req.toString());
|
|
|
|
|
|
- //将用户消费的信息插入顾客表
|
|
|
- Map<String, Object> infoMap = payOrderService.getOrderInfoAndUserInfoByOrderNo(payOrder);
|
|
|
+ //将用户消费的信息插入顾客表 以手机号 油品名称 油站id为条件插入且存入 加油升数、实收金额、油站名称 根据订单号查询用户手机号
|
|
|
+ Map<String, Object> infoMap = payOrderService.getOrderInfoAndUserInfoByOrderNo(payOrder); //获取该订单手机号、加油升数、实收金额、油站名称
|
|
|
//手机号必须有
|
|
|
if(infoMap != null && infoMap.containsKey("mobilePhone") && infoMap.get("mobilePhone") !=null ){
|
|
|
//存放客户信息
|
|
|
CustomerManage customerManage = new CustomerManage();
|
|
|
- String userType = infoMap.get("userType").toString();
|
|
|
+ //存放查询用户信息
|
|
|
+ AppUserInfo appUserInfo = new AppUserInfo();
|
|
|
+ appUserInfo.setMobilePhone(infoMap.get("mobilePhone").toString());
|
|
|
+ //从客户信息表查询数据用于插入客户表 使用List原因:app_user_info存在小程序和公众号两种信息
|
|
|
+ List<AppUserInfo> appUserInfoList = payOrderService.getUserInfoByOpenId(appUserInfo);
|
|
|
Date blogRegTime = null; //公众号注册时间
|
|
|
Date minaRegTime = null; //小程序注册时间
|
|
|
- switch (userType){
|
|
|
- case "1":
|
|
|
- customerManage.setBlogOpenid(infoMap.get("blogOpenid").toString());
|
|
|
- customerManage.setBlogUserId((Integer) infoMap.get("userId"));
|
|
|
- customerManage.setPhoneNumber(infoMap.get("mobilePhone").toString());
|
|
|
- blogRegTime = (Date) infoMap.get("registeDate");
|
|
|
- break;
|
|
|
- case "2":
|
|
|
- customerManage.setMinaOpenid(infoMap.get("minaOpenid").toString());
|
|
|
- customerManage.setMinaUserId((Integer) infoMap.get("userId"));
|
|
|
- customerManage.setPhoneNumber(infoMap.get("mobilePhone").toString());
|
|
|
- minaRegTime = (Date) infoMap.get("registeDate");
|
|
|
- break;
|
|
|
- }
|
|
|
- //判断公众号和小程序时间取最早的时间
|
|
|
- if(blogRegTime !=null && minaRegTime != null){
|
|
|
- if(blogRegTime.compareTo(minaRegTime) >0){
|
|
|
+ if(appUserInfoList != null && appUserInfoList.size() >0){
|
|
|
+ for(AppUserInfo u : appUserInfoList){
|
|
|
+ //向客户表插入小程序和公众号的openId 用户表ID 用户手机号 注册时间
|
|
|
+ switch (u.getUserType()){
|
|
|
+ case "1":
|
|
|
+ customerManage.setBlogOpenid(u.getBlogOpenid());
|
|
|
+ customerManage.setBlogUserId(u.getUserId());
|
|
|
+ customerManage.setPhoneNumber(u.getMobilePhone());
|
|
|
+ blogRegTime =u.getRegisteDate();
|
|
|
+ break;
|
|
|
+ case "2":
|
|
|
+ customerManage.setMinaOpenid(u.getMinaOpenid());
|
|
|
+ customerManage.setMinaUserId(u.getUserId());
|
|
|
+ customerManage.setPhoneNumber(u.getMobilePhone());
|
|
|
+ minaRegTime = u.getRegisteDate();
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ //判断公众号和小程序时间取最早的时间
|
|
|
+ if(blogRegTime !=null && minaRegTime != null){
|
|
|
+ if(blogRegTime.compareTo(minaRegTime) >0){
|
|
|
+ customerManage.setRegtime(minaRegTime);
|
|
|
+ }else if(blogRegTime.compareTo(minaRegTime) <0){
|
|
|
+ customerManage.setRegtime(blogRegTime);
|
|
|
+ }else if(blogRegTime.compareTo(minaRegTime) ==0){
|
|
|
+ //相等时随便取一个
|
|
|
+ customerManage.setRegtime(minaRegTime);
|
|
|
+ }
|
|
|
+ }else if(blogRegTime == null){
|
|
|
customerManage.setRegtime(minaRegTime);
|
|
|
- }else if(blogRegTime.compareTo(minaRegTime) <0){
|
|
|
+ }else if(minaRegTime == null){
|
|
|
customerManage.setRegtime(blogRegTime);
|
|
|
- }else if(blogRegTime.compareTo(minaRegTime) ==0){
|
|
|
- //相等时随便取一个
|
|
|
- customerManage.setRegtime(minaRegTime);
|
|
|
}
|
|
|
- }else if(blogRegTime == null){
|
|
|
- customerManage.setRegtime(minaRegTime);
|
|
|
- }else if(minaRegTime == null){
|
|
|
- customerManage.setRegtime(blogRegTime);
|
|
|
}
|
|
|
customerManage.setStationId(Integer.valueOf(infoMap.get("stationId").toString())); //油站ID
|
|
|
customerManage.setOilName(infoMap.get("oilName").toString()); //油品名称
|
|
@@ -538,7 +547,7 @@ public class PayController {
|
|
|
}else {
|
|
|
customerManage.setLiters(BigDecimal.valueOf((Double) infoMap.get("orderLiters")));
|
|
|
}
|
|
|
- logger.info("存在客户 更新时参数: " + customerManage.getPhoneNumber());
|
|
|
+ logger.info("存在客户 更新时手机号参数: " + customerManage.getPhoneNumber());
|
|
|
//存在 更新
|
|
|
payOrderService.updateCustomer(customerManage);
|
|
|
}else{
|