Skip to content

O
order-group
Commit 9df7b7c4 by ping.wu
Options

代码冲突修改

parent cdce86b5
Showing with 196 additions and 196 deletions
order-application-service/src/main/java/cn/freemud/adapter/UserAdapter.java
//package cn.freemud.adapter;
//
//import cn.freemud.entities.dto.*;
//import cn.freemud.entities.vo.AddDeliveryAddressVo;
//import cn.freemud.entities.vo.CreateOrderVo;
//import cn.freemud.entities.vo.QueryReceiveAddressResponseVo;
//import cn.freemud.entities.vo.UserLoginVo;
//import cn.freemud.enums.ReceiveAddressLabelType;
//import cn.freemud.enums.SexType;
//import cn.freemud.manager.OpenPlatformPartnerStoreDeliveryConfigManager;
//import cn.freemud.service.impl.StoreServiceImpl;
//import cn.freemud.utils.UnicodeUtil;
//import com.alibaba.fastjson.JSONObject;
//import com.google.common.collect.Lists;
//import com.google.common.collect.Maps;
//import com.google.gson.Gson;
//import org.apache.commons.collections4.CollectionUtils;
//import org.apache.commons.lang.StringUtils;
//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.stereotype.Component;
//
//import java.util.*;
//import java.util.stream.Collectors;
//
//@Component
//public class UserAdapter {
//
// public UserLoginInfoDto getUserLoginInfoDto(Map<String, Object> map) {
// UserLoginInfoDto userLoginInfoDto = new UserLoginInfoDto();
// userLoginInfoDto.setOpenId(String.valueOf(map.get("openid")));
// userLoginInfoDto.setWxAppId(String.valueOf(map.get("wxAppId")));
// userLoginInfoDto.setSessionKey(String.valueOf(map.get("session_key")));
// userLoginInfoDto.setMobile(String.valueOf(map.get("mobile")));
// userLoginInfoDto.setAppSecret(String.valueOf(map.get("appsecret")));
// userLoginInfoDto.setMemberId(String.valueOf(map.get("memberId")));
// userLoginInfoDto.setPartnerId(String.valueOf(map.get("partnerId")));
// userLoginInfoDto.setUnionId(String.valueOf(map.get("unionId")));
// userLoginInfoDto.setNewMember(Boolean.valueOf(map.get("newMember").toString()));
// userLoginInfoDto.setNickName(String.valueOf(map.get("nickName")));
// return userLoginInfoDto;
// }
//}
package cn.freemud.adapter;
import cn.freemud.entities.dto.*;
import cn.freemud.entities.vo.AddDeliveryAddressVo;
import cn.freemud.entities.vo.CreateOrderVo;
import cn.freemud.entities.vo.QueryReceiveAddressResponseVo;
import cn.freemud.entities.vo.UserLoginVo;
import cn.freemud.enums.ReceiveAddressLabelType;
import cn.freemud.enums.SexType;
import cn.freemud.manager.OpenPlatformPartnerStoreDeliveryConfigManager;
import cn.freemud.service.impl.StoreServiceImpl;
import cn.freemud.utils.UnicodeUtil;
import com.alibaba.fastjson.JSONObject;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.gson.Gson;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.*;
import java.util.stream.Collectors;
@Component
public class UserAdapter {
public UserLoginInfoDto getUserLoginInfoDto(Map<String, Object> map) {
UserLoginInfoDto userLoginInfoDto = new UserLoginInfoDto();
userLoginInfoDto.setOpenId(String.valueOf(map.get("openid")));
userLoginInfoDto.setWxAppId(String.valueOf(map.get("wxAppId")));
userLoginInfoDto.setSessionKey(String.valueOf(map.get("session_key")));
userLoginInfoDto.setMobile(String.valueOf(map.get("mobile")));
userLoginInfoDto.setAppSecret(String.valueOf(map.get("appsecret")));
userLoginInfoDto.setMemberId(String.valueOf(map.get("memberId")));
userLoginInfoDto.setPartnerId(String.valueOf(map.get("partnerId")));
userLoginInfoDto.setUnionId(String.valueOf(map.get("unionId")));
userLoginInfoDto.setNewMember(Boolean.valueOf(map.get("newMember").toString()));
userLoginInfoDto.setNickName(String.valueOf(map.get("nickName")));
return userLoginInfoDto;
}
}
order-application-service/src/main/java/cn/freemud/entities/dto/UserLoginInfoDto.java
//package cn.freemud.entities.dto;
//
//import lombok.Data;
//
//@Data
//public class UserLoginInfoDto {
//
//// private String openId;
////
//// private String wxAppid;
////
//// private String sessionKey;
////
//// private String mobile;
////
//// private String appsecret;
////
//// private String memberId;
////
//// private String partnerId;
////
//// private boolean newMemeber;
////
//// private String unionId;
////
//// private String nickName;
package cn.freemud.entities.dto;
import lombok.Data;
@Data
public class UserLoginInfoDto {
// private String openId;
//
// private String wxAppid;
//
// private String openId;
// private String unionId;
// private String wxAppId;
// private String sessionKey;
//
// private String mobile;
// private String appSecret;
//
// private String appsecret;
//
// private String memberId;
//
// private String partnerId;
// private Boolean newMember;
// private String devBrand;
// private String devModel;
// private String channel;
//
// private boolean newMemeber;
//
// private String unionId;
//
// private String nickName;
// private String photoUrl;
// private String sessionId;
// private String tableNumber;
// private String iappId;
// private String storeId;
// private String userId;
// private String accessToken;
// private String alipayUserId;
// private String alipayAppId;
//}
private String openId;
private String unionId;
private String wxAppId;
private String sessionKey;
private String mobile;
private String appSecret;
private String memberId;
private String partnerId;
private Boolean newMember;
private String devBrand;
private String devModel;
private String channel;
private String nickName;
private String photoUrl;
private String sessionId;
private String tableNumber;
private String iappId;
private String storeId;
private String userId;
private String accessToken;
private String alipayUserId;
private String alipayAppId;
}
order-application-service/src/main/java/cn/freemud/service/UserService.java
//package cn.freemud.service;
//
//import cn.freemud.entities.dto.UserLoginInfoDto;
//
//import java.util.Map;
//
///**
// * 用户服务
// *
// * @author liming.guo
// * @date 2018/05/08
// */
//public interface UserService {
//
// Map<String, Object> getUserInfoMapBySessionId(String sessionId);
//
// /**
// * 获取缓存用户信息
// *
// * @param sessionId
// * @return
// */
// UserLoginInfoDto getUserLoginInfoBySessionId(String sessionId);
//
//}
package cn.freemud.service;
import cn.freemud.entities.dto.UserLoginInfoDto;
import java.util.Map;
/**
* 用户服务
*
* @author liming.guo
* @date 2018/05/08
*/
public interface UserService {
Map<String, Object> getUserInfoMapBySessionId(String sessionId);
/**
* 获取缓存用户信息
*
* @param sessionId
* @return
*/
UserLoginInfoDto getUserLoginInfoBySessionId(String sessionId);
}
order-application-service/src/main/java/cn/freemud/service/impl/CheckMallOrder.java
......@@ -70,7 +70,7 @@ public class CheckMallOrder {
*/
public void checkOrderByDelivery(CreateOrderVo createOrderVo, UserLoginInfoDto userLoginInfoDto,
StoreResponse.BizVO storeResponseDto,Long totalAmount, String trackingNo) {
StoreDeliveryInfoDto storeDeliveryInfoDto = this.getStoreDeliveryInfo(storeResponseDto, userLoginInfoDto.getWxAppid());
StoreDeliveryInfoDto storeDeliveryInfoDto = this.getStoreDeliveryInfo(storeResponseDto, userLoginInfoDto.getWxAppId());
//订单金额小于起送费提示
if (storeDeliveryInfoDto.getDeliveryLimitAmount() > totalAmount) {
throw new ServiceException(ResponseResult.STORE_DISCONTENT_DELIVERY_FEE);
......
order-application-service/src/main/java/cn/freemud/service/impl/MallOrderServiceImpl.java
......@@ -128,7 +128,7 @@ public class MallOrderServiceImpl implements MallOrderService {
// 查询用户信息、校验svc卡,余额购物车校验
UserLoginInfoDto userLoginInfoDto = checkMallOrder.checkOrderByMember(createOrderVo, trackingNo);
// 设置门店id为商城的虚拟门店id
this.change2BindMallShopId(createOrderVo, userLoginInfoDto.getWxAppid());
this.change2BindMallShopId(createOrderVo, userLoginInfoDto.getWxAppId());
// 查询门店信息 营业时间、营业状态，服务器当前时间在营业时间内 点餐桌号
StoreResponse.BizVO storeResponseDto = checkMallOrder.checkOrderByStore(createOrderVo, trackingNo);
// 查询购物车（内部校验券点餐方式，券是否可用） 校验当前订单类型的下单参数
......@@ -220,7 +220,7 @@ public class MallOrderServiceImpl implements MallOrderService {
OrderExtInfoDTO orderExtInfoDto = new OrderExtInfoDTO();
orderExtInfoDto.setOpenid(userLoginInfoDto.getOpenId());
orderExtInfoDto.setAppid(userLoginInfoDto.getWxAppid());
orderExtInfoDto.setAppid(userLoginInfoDto.getWxAppId());
orderExtInfoDto.setSessionId(sessionId);
orderExtInfoDto.setVersion(version);
return orderExtInfoDto;
......@@ -293,7 +293,7 @@ public class MallOrderServiceImpl implements MallOrderService {
}
private PaymentRequest orderBodyConvertToPaymentBody(UserLoginInfoDto userLoginInfoDto, String partnerId) {
String wxAppId = userLoginInfoDto.getWxAppid();
String wxAppId = userLoginInfoDto.getWxAppId();
//设置支付信息
PaymentRequest paymentRequest = new PaymentRequest();
paymentRequest.setOpenId(userLoginInfoDto.getOpenId());
......
order-application-service/src/main/java/cn/freemud/service/impl/UserServiceImpl.java
//package cn.freemud.service.impl;
//
//import cn.freemud.adapter.UserAdapter;
//import cn.freemud.constant.RedisKeyConstant;
//import cn.freemud.constant.UserInfoKeyConstant;
//import cn.freemud.entities.dto.UserLoginInfoDto;
//import cn.freemud.enums.ResponseResult;
//import cn.freemud.interceptor.ServiceException;
//import cn.freemud.redis.RedisCache;
//import cn.freemud.service.UserService;
//import com.google.gson.Gson;
//import lombok.extern.slf4j.Slf4j;
//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.stereotype.Service;
//
//import java.util.Map;
//
///**
// * @author liming.guo
// * @date 2018/05/11
// */
//@Service
//@Slf4j
//public class UserServiceImpl implements UserService {
// private static Gson gson = new Gson();
// @Autowired
// private UserAdapter userAdapter;
// @Autowired
// private RedisCache redisCache;
//
// /**
// * 校验用户是否登录
// */
// public void checkUserLogin(String sessionId) {
// Map<String, Object> userInfoMap = this.getUserInfoMapBySessionId(sessionId);
// if (userInfoMap == null || userInfoMap.size() <= 0 || userInfoMap.get(UserInfoKeyConstant.MEMBER_ID) == null) {
// throw new ServiceException(ResponseResult.NOT_LOGIN);
// }
// }
// /**
// * 校验用户是否登录
// */
// public boolean checkUserLoginFlag(String sessionId) {
// Map<String, Object> userInfoMap = this.getUserInfoMapBySessionId(sessionId);
// log.info("submit userInfoMap:{}", gson.toJson(userInfoMap));
// if (userInfoMap == null || userInfoMap.size() <= 0 || userInfoMap.get(UserInfoKeyConstant.MEMBER_ID) == null) {
// return false;
// }
// return true;
// }
//
// /**
// * 获取缓存用户信息
// */
// @Override
// public Map<String, Object> getUserInfoMapBySessionId(String sessionId) {
// String redisKey = RedisKeyConstant.SAAS_USER_INFO_SESSIONID_KEY_PREFIX + sessionId;
// Map<String, Object> map;
// try {
// map = redisCache.getValue(redisKey);
// }catch (Exception e){
// map = redisCache.getValue(redisKey);
// }
// return map;
// }
//
// /**
// * 获取缓存用户信息
// *
// * @param sessionId
// * @return
// */
// @Override
// public UserLoginInfoDto getUserLoginInfoBySessionId(String sessionId) {
// checkUserLogin(sessionId);
//
// String redisKey = RedisKeyConstant.SAAS_USER_INFO_SESSIONID_KEY_PREFIX + sessionId;
// Map<String, Object> map = redisCache.getValue(redisKey);
// return userAdapter.getUserLoginInfoDto(map);
// }
//}
package cn.freemud.service.impl;
import cn.freemud.adapter.UserAdapter;
import cn.freemud.constant.RedisKeyConstant;
import cn.freemud.constant.UserInfoKeyConstant;
import cn.freemud.entities.dto.UserLoginInfoDto;
import cn.freemud.enums.ResponseResult;
import cn.freemud.interceptor.ServiceException;
import cn.freemud.redis.RedisCache;
import cn.freemud.service.UserService;
import com.google.gson.Gson;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Map;
/**
* @author liming.guo
* @date 2018/05/11
*/
@Service
@Slf4j
public class UserServiceImpl implements UserService {
private static Gson gson = new Gson();
@Autowired
private UserAdapter userAdapter;
@Autowired
private RedisCache redisCache;
/**
* 校验用户是否登录
*/
public void checkUserLogin(String sessionId) {
Map<String, Object> userInfoMap = this.getUserInfoMapBySessionId(sessionId);
if (userInfoMap == null || userInfoMap.size() <= 0 || userInfoMap.get(UserInfoKeyConstant.MEMBER_ID) == null) {
throw new ServiceException(ResponseResult.NOT_LOGIN);
}
}
/**
* 校验用户是否登录
*/
public boolean checkUserLoginFlag(String sessionId) {
Map<String, Object> userInfoMap = this.getUserInfoMapBySessionId(sessionId);
log.info("submit userInfoMap:{}", gson.toJson(userInfoMap));
if (userInfoMap == null || userInfoMap.size() <= 0 || userInfoMap.get(UserInfoKeyConstant.MEMBER_ID) == null) {
return false;
}
return true;
}
/**
* 获取缓存用户信息
*/
@Override
public Map<String, Object> getUserInfoMapBySessionId(String sessionId) {
String redisKey = RedisKeyConstant.SAAS_USER_INFO_SESSIONID_KEY_PREFIX + sessionId;
Map<String, Object> map;
try {
map = redisCache.getValue(redisKey);
}catch (Exception e){
map = redisCache.getValue(redisKey);
}
return map;
}
/**
* 获取缓存用户信息
*
* @param sessionId
* @return
*/
@Override
public UserLoginInfoDto getUserLoginInfoBySessionId(String sessionId) {
checkUserLogin(sessionId);
String redisKey = RedisKeyConstant.SAAS_USER_INFO_SESSIONID_KEY_PREFIX + sessionId;
Map<String, Object> map = redisCache.getValue(redisKey);
return userAdapter.getUserLoginInfoDto(map);
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment