Skip to content

O
order-group
Commit 4d346291 by ping.wu
Options

Merge branches 'feature/20210806_日志问题修复_wuping' and 'qa' of… 

Merge branches 'feature/20210806_日志问题修复_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
parents d975fba3 a4cdaccd
Showing with 28 additions and 23 deletions
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/ConfirmOrderRequest.java
......@@ -81,6 +81,8 @@ public class ConfirmOrderRequest extends BaseConfig {
private Integer notAutomaticTwistTime;
private String userId;
@Data
public static class OrderSettlement{
/**
......
order-application-service/src/main/java/cn/freemud/service/business/impl/OrderBusinessServiceImpl.java
......@@ -89,31 +89,28 @@ public class OrderBusinessServiceImpl implements OrderBusinessService {
request.setPayChannel(confirmOrderRequest.getPayChannel());
request.setPayChannelName(confirmOrderRequest.getPayChannelName());
}
QueryOrderByIdResponse orderByIdResponse = new QueryOrderByIdResponse();
BaseResponse<GetMemberExtendInfoResponseDto> extendInfo = new BaseResponse();
// QueryOrderByIdResponse orderByIdResponse = new QueryOrderByIdResponse();
// BaseResponse<GetMemberExtendInfoResponseDto> extendInfo = new BaseResponse();
try {
QueryByCodeResponse codeResponse = orderSdkService.getOrderInfo(confirmOrderRequest.getProductOrderCode(),
0, confirmOrderRequest.getTrackingNo());
orderByIdResponse = orderSdkAdapter.convent2QueryOrderByIdResponse(codeResponse);
// QueryByCodeResponse codeResponse = orderSdkService.getOrderInfo(confirmOrderRequest.getProductOrderCode(),
// 0, confirmOrderRequest.getTrackingNo());
// orderByIdResponse = orderSdkAdapter.convent2QueryOrderByIdResponse(codeResponse);
GetMemberExtendInfoRequestDto extendInfoRequest = new GetMemberExtendInfoRequestDto();
extendInfoRequest.setMemberId(orderByIdResponse.getData().getUserId());
extendInfoRequest.setPartnerId(orderByIdResponse.getData().getCompanyId());
extendInfoRequest.setMemberId(confirmOrderRequest.getUserId());
extendInfoRequest.setPartnerId(confirmOrderRequest.getPartnerId());
extendInfoRequest.setIsQueryGrade(1);
extendInfoRequest.setIsQueryLabel(0);
extendInfoRequest.setIsQueryPaid(1);
extendInfo = customerClient.getMemberExtendInfo(extendInfoRequest);
OrderExtInfoDto extInfoDTO = JSONObject.parseObject(orderByIdResponse.getData().getExtInfo(),
OrderExtInfoDto.class);
extInfoDTO.setMemberLevel(
extendInfo.getData().getMemberGrade() != null ? extendInfo.getData().getMemberGrade().getRuleName()
: "");
BaseResponse<GetMemberExtendInfoResponseDto> extendInfo = customerClient.getMemberExtendInfo(extendInfoRequest);
OrderExtInfoDto extInfoDTO = JSONObject.parseObject(confirmOrderRequest.getExtInfo(),OrderExtInfoDto.class);
extInfoDTO.setMemberLevel(extendInfo.getData().getMemberGrade() != null ? extendInfo.getData().getMemberGrade().getRuleName(): "");
extInfoDTO.setPaidMember(CollectionUtils.isNotEmpty(extendInfo.getData().getMemberPaids()));
extInfoDTO.setPayTransId(confirmOrderRequest.getPayTransId());
extInfoDTO.setPayDate(confirmOrderRequest.getPayDate());
extInfoDTO.setEndTransId(confirmOrderRequest.getEndTransId());
request.setExtInfo(JSON.toJSONString(extInfoDTO));
if (!StringUtils.isEmpty(confirmOrderRequest.getSpellGroupCode())) {
if (StringUtils.isNotEmpty(confirmOrderRequest.getSpellGroupCode())) {
request.setSpellGroupCode(confirmOrderRequest.getSpellGroupCode());
}
} catch (Exception e) {
......@@ -121,10 +118,6 @@ public class OrderBusinessServiceImpl implements OrderBusinessService {
}
com.freemud.application.sdk.api.ordercenter.response.BaseResponse<PaySuccessResp> response = orderSdkService
.paySuccess(request, confirmOrderRequest.getTrackingNo());
// 获取会员信息直接返回，非空判断
if (extendInfo.getData() == null) {
return orderSdkAdapter.convent2PayAccessResponse(response);
}
return orderSdkAdapter.convent2PayAccessResponse(response);
}
......
order-application-service/src/main/java/cn/freemud/service/impl/MallOrderServiceImpl.java
......@@ -474,6 +474,7 @@ public class MallOrderServiceImpl implements MallOrderService {
PayAccessResponse payAccessResponse;
ConfirmOrderRequest confirmOrderRequest = LightApplicationConvertToAssortmentSdkAdapter.confirmOrderDtoConvertToConfirmOrderRequest(confirmOrderDto, null);
confirmOrderRequest.setPartnerId(partnerId);
confirmOrderRequest.setUserId(userId);
confirmOrderRequest.setStoreId(storeId);
confirmOrderRequest.setOrderId(orderBean.getOid());
confirmOrderRequest.setOrderType(orderBean.getType());
......
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
......@@ -508,6 +508,7 @@ public class OrderServiceImpl implements Orderservice {
PayAccessResponse payAccessResponse;
ConfirmOrderRequest var1 = LightApplicationConvertToAssortmentSdkAdapter.confirmOrderDtoConvertToConfirmOrderRequest(confirmOrderDto, orderBeans.get(OrderBeanType.MERMBERORDER.getCode()));
var1.setPartnerId(partnerId);
var1.setUserId(userId);
var1.setStoreId(storeId);
var1.setOrderType(orderBean.getType());
var1.setProductOrderCode(orderBean.getOid());
......
order-application-service/src/main/java/cn/freemud/service/impl/SellCouponOrderServiceImpl.java
......@@ -793,6 +793,7 @@ public class SellCouponOrderServiceImpl {
ConfirmOrderRequest var1 = LightApplicationConvertToAssortmentSdkAdapter.confirmOrderDtoConvertToConfirmOrderRequest(confirmOrderDto, orderBeans.get(OrderBeanType.MERMBERORDER.getCode()));
var1.setPartnerId(orderBean.getCompanyId());
var1.setUserId(orderBean.getUserId());
var1.setStoreId(orderBean.getShopId());
var1.setOrderType(orderBean.getType());
var1.setProductOrderCode(orderBean.getOid());
......@@ -807,7 +808,7 @@ public class SellCouponOrderServiceImpl {
// 订单支付成功
PayAccessResponse payAccessResponse = orderBusinessService.payAccess(var1);
}catch (Exception e){
AppLogUtil.errorLog("sdkPayAccessError",JSONObject.toJSONString(var1),null,e);
AppLogUtil.errorLog("sellCouponPayAccessError",JSONObject.toJSONString(var1),null,e);
}
//支付成功直接完成
OrderChangeStateReq request = new OrderChangeStateReq();
......
shopping-cart-application-service/src/main/java/cn/freemud/adapter/CouponAdapter.java
......@@ -565,11 +565,18 @@ public class CouponAdapter {
couponPromotionVO.setOrderType(shoppingCartInfoRequestVo.getOrderType());
// couponPromotionVO.setFlg(shoppingCartInfoRequestVo.getFlag());
couponPromotionVO.setAvailableCouponQueryFlag(shoppingCartInfoRequestVo.getFlag() == null ? "":shoppingCartInfoRequestVo.getFlag().toString());
// couponPromotionVO.setAvailableCouponQueryFlag(shoppingCartInfoRequestVo.getFlag() == null ? "":shoppingCartInfoRequestVo.getFlag().toString());
//老版本结算页查询可用优惠券
if(Objects.equals(shoppingCartInfoRequestVo.getFlag(), SubmitPageEnum.YES.getCode())){
couponPromotionVO.setAvailableCouponQueryFlag(shoppingCartInfoRequestVo.getVersion());
couponPromotionVO.setAvailableCouponQueryFlag(AvailableCouponQueryFlagEnum.YES.getCode());
}else {
//点餐页不查询可用优惠券
couponPromotionVO.setAvailableCouponQueryFlag(AvailableCouponQueryFlagEnum.NO.getCode());
}
//结算页购物车固定版本2不查询可用优惠券
if(Objects.equals(shoppingCartInfoRequestVo.getFlag(), SubmitPageEnum.YES.getCode()) && "2".equals(shoppingCartInfoRequestVo.getVersion())){
couponPromotionVO.setAvailableCouponQueryFlag(AvailableCouponQueryFlagEnum.NO.getCode());
}
couponPromotionVO.setUnChooseCouponCode(shoppingCartInfoRequestVo.getUnChooseCouponCode());
// 重新校验一遍 couponcodes
if (CollectionUtils.isNotEmpty(couponPromotionVO.getCouponCodes())) {
......
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/CouponPromotionService.java
......@@ -55,7 +55,7 @@ public class CouponPromotionService implements IPromotionService {
ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo, UserLoginInfoDto userLoginInfoDto,
ShoppingCartInfoRequestVo shoppingCartInfoRequestVo) {
// 用户选择了查询优惠券信息
if (couponPromotionVO != null && !ObjectUtils.equals(AvailableCouponQueryFlagEnum.NO.getCode(), couponPromotionVO.getAvailableCouponQueryFlag())) {
if (couponPromotionVO != null && ObjectUtils.equals(AvailableCouponQueryFlagEnum.YES.getCode(), couponPromotionVO.getAvailableCouponQueryFlag())) {
List<CartGoods> tmpCartGoods = cartGoodsList.parallelStream().filter(k -> (k.getCartGoodsUid()
.startsWith(CommonsConstant.COUPON_PREFIX) || StringUtils.isNotBlank(k.getCouponCode()))).collect(Collectors.toList());
// 是否存在商品券
......
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