Skip to content

O
order-group
Commit 409fa153 by 缪晖
Options

Merge branch 'develop_mergeTest' into 'develop' 

Develop merge test

See merge request !112
parents 31d28678 2f42daf5
Showing with 200 additions and 35 deletions
assortment-ordercenter-sdk/readme.md
......@@ -249,3 +249,6 @@
| 2.1.56-RELEASE | 统一升级华莱士微商城SDK | 张志恒 | 2021-05-11|
| 2.1.57-RELEASE | 统一升级华莱士微商城SDK | 张志恒 | 2021-05-11|
| 2.1.58-RELEASE | 统一升级华莱士微商城SDK | 张志恒 | 2021-05-11|
| 2.1.59-RELEASE | 美团聚宝盆修改为美团服务商 | 梁崇福 | 2021-05-13|
| 2.1.60-RELEASE | 麦咖啡新增优惠类型 | 徐康 | 2021-05-13|
| 2.1.61-RELEASE | 商城退款优化 | 张志恒 | 2021-05-13|
\ No newline at end of file
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
......@@ -252,7 +252,7 @@ public class OrderSdkAdapter {
deliveryContactInfoCreateReq.setRelateObjectType(1);
//联系方式类型 1:取件 2:收件
deliveryContactInfoCreateReq.setInfoType(1);
deliveryContactInfoCreateReq.setContactsName(requestVO.getUserName());
deliveryContactInfoCreateReq.setContactsName(requestVO.getContactsName());
deliveryContactInfoCreateReq.setMobile(requestVO.getPhone());
deliveryContactInfoCreateReq.setLatitude(StringUtils.isBlank(requestVO.getLatitude()) ? null : new BigDecimal(requestVO.getLatitude()));
deliveryContactInfoCreateReq.setLongitude(StringUtils.isBlank(requestVO.getLongitude()) ? null : new BigDecimal(requestVO.getLongitude()));
......
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/BaseCreateOrderRequest.java
......@@ -42,6 +42,10 @@ public class BaseCreateOrderRequest extends BaseConfig {
*/
private String userName;
/**
* 收货名姓名
*/
private String contactsName;
/**
* 三方单号
*/
private String thirdOrderCode;
......
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/OrderCenterSdkService.java
......@@ -363,6 +363,11 @@ public interface OrderCenterSdkService {
BaseOrderResponse mallOrderRefundComplete(BaseQueryOrderRequest baseQueryOrderRequest);
/**
* 商城订单同意并退款完成 POS
*/
BaseOrderResponse adultApproveWithRefundComplete(BaseQueryOrderRequest baseQueryOrderRequest);
/**
* 商城订单同意并退货完成 POS
*/
BaseOrderResponse mallOrderRefundReturn(BaseQueryOrderRequest baseQueryOrderRequest);
......
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java
......@@ -2069,6 +2069,21 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
}
@Override
public BaseOrderResponse adultApproveWithRefundComplete(BaseQueryOrderRequest baseQueryOrderRequest) {
AfterSalesOperateReq request = new AfterSalesOperateReq();
request.setOrderCode(baseQueryOrderRequest.getOrderId());
request.setPartnerId(baseQueryOrderRequest.getPartnerId());
request.setOrderClient(OrderClientType.SAASMALL.getIndex());
request.setAfterSalesCode(baseQueryOrderRequest.getAfterSalesCode());
request.setAfterSerialNo(baseQueryOrderRequest.getRefundSerialNo());
request.setAdultRemark(baseQueryOrderRequest.getReason());
request.setOperator(baseQueryOrderRequest.getOperator());
com.freemud.application.sdk.api.ordercenter.response.BaseResponse response = orderSdkService.adultApproveWithRefundComplete(request, baseQueryOrderRequest.getTrackingNo());
return orderSdkAdapter.convent2BaseOrderResponse(response);
}
@Override
public BaseOrderResponse mallOrderRefundReturn(BaseQueryOrderRequest baseQueryOrderRequest) {
AfterSalesExpressOperateReq request = new AfterSalesExpressOperateReq();
request.setOrderCode(baseQueryOrderRequest.getOrderId());
......
order-application-service/pom.xml
......@@ -197,11 +197,11 @@
<artifactId>commons-collections4</artifactId>
<version>4.1</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>com.freemud.application.service.sdk</groupId>-->
<!-- <artifactId>open-store-open-platform-sdk</artifactId>-->
<!-- <version>1.3.5-SNAPSHOT</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>com.freemud.application.service.sdk</groupId>-->
<!-- <artifactId>open-store-open-platform-sdk</artifactId>-->
<!-- <version>1.3.5-SNAPSHOT</version>-->
<!-- </dependency>-->
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId>
......@@ -269,11 +269,11 @@
<version>2.7.0</version>
</dependency>
<!-- 券码SDK -->
<!-- <dependency>-->
<!-- <groupId>com.freemud.card.sdk</groupId>-->
<!-- <artifactId>freemud-card-sdk</artifactId>-->
<!-- <version>2.4.18-RELEASE</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>com.freemud.card.sdk</groupId>-->
<!-- <artifactId>freemud-card-sdk</artifactId>-->
<!-- <version>2.4.18-RELEASE</version>-->
<!-- </dependency>-->
<dependency>
<groupId>io.github.openfeign.form</groupId>
......
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
......@@ -99,6 +99,7 @@ import java.math.BigDecimal;
import java.security.NoSuchAlgorithmException;
import java.security.spec.InvalidKeySpecException;
import java.text.DecimalFormat;
import java.time.Instant;
import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;
......@@ -678,7 +679,7 @@ public class OrderAdapter {
orderType = OrderType.MALL.getCode();
receiveAddress = (userDeliveryInfoDto != null ? userDeliveryInfoDto.getReceiveProvince()+userDeliveryInfoDto.getReceiveCity()+userDeliveryInfoDto.getReceiveRegion()+ userDeliveryInfoDto.getReceiveAddress() : "");
createOrderVo.setMobile(userDeliveryInfoDto.getReceiveMobile());
createOrderVo.setUserName(userDeliveryInfoDto.getReceiveUserName());
createOrderVo.setContactsName(userDeliveryInfoDto.getReceiveUserName());
} else {
throw new ServiceException(ResponseResult.PARAMETER_MISSING, "非法的订单类型");
}
......@@ -3235,7 +3236,8 @@ public class OrderAdapter {
createOrderResponseVo.setWxappId(orderPayResponse.getWxAppid());
createOrderResponseVo.setFmId(orderPayResponse.getFmId());
OrderPayResponse.PayOrderBean payOrderBean = orderPayResponse.getPayOrder();
createOrderResponseVo.setTimestamp(payOrderBean == null ? "" : payOrderBean.getTimestamp());
// 腾讯有数数据上报 时间戳不能为空
createOrderResponseVo.setTimestamp(payOrderBean == null ? Instant.now().getEpochSecond()+"" : payOrderBean.getTimestamp());
createOrderResponseVo.setNonceStr(payOrderBean == null ? "" : payOrderBean.getNonceStr());
createOrderResponseVo.setPackageX(payOrderBean == null ? "" : payOrderBean.getPackageX());
createOrderResponseVo.setSignType(payOrderBean == null ? "" : payOrderBean.getSignType());
......
order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderVo.java
......@@ -447,4 +447,9 @@ public class CreateOrderVo {
* 使用户省份code 100010 这是微信选择地址传过来的，用户查询配送费用的， 并不是北京市这种给是
*/
private String province;
/**
* 收货名姓名
*/
private String contactsName;
}
order-application-service/src/main/java/cn/freemud/service/delivery/ThirdDeliveryServiceImpl.java
......@@ -462,10 +462,19 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
}
ecologyAdminApplicationClient.subscribeMessage(request);
} catch (Exception e) {
LogUtil.error("麦咖啡订阅消息推送失败:", orderId, "", e);
ApiLog.info("麦咖啡订阅消息推送失败" + orderId + getExceptionInfo(e));
}
}
private String getExceptionInfo(Exception e) {
StringBuilder sb = new StringBuilder();
StackTraceElement[] trace = e.getStackTrace();
for (StackTraceElement traceElement : trace) {
sb.append("\tat " + traceElement);
}
return sb.toString();
}
/**
* 配送消息推送
*/
......
order-application-service/src/main/java/cn/freemud/service/impl/CheckMallOrder.java
......@@ -84,6 +84,7 @@ public class CheckMallOrder {
throw new ServiceException(ResponseResult.NOT_LOGIN);
}
createOrderVo.setUserId(userLoginInfoDto.getMemberId());
createOrderVo.setUserName(userLoginInfoDto.getNickName());
return userLoginInfoDto;
}
......
order-application-service/src/main/java/cn/freemud/service/impl/MallOrderServiceImpl.java
......@@ -10,6 +10,7 @@ import cn.freemud.amqp.MQService;
import cn.freemud.base.entity.BaseResponse;
import cn.freemud.base.log.LogTreadLocal;
import cn.freemud.base.util.DateUtil;
import cn.freemud.base.util.JsonUtil;
import cn.freemud.constant.RedisKeyConstant;
import cn.freemud.constant.ResponseCodeConstant;
import cn.freemud.entities.dto.*;
......@@ -74,6 +75,8 @@ import com.freemud.sdk.api.assortment.order.response.order.*;
import com.freemud.sdk.api.assortment.order.response.payment.OrderPayResponse;
import com.freemud.sdk.api.assortment.order.service.OrderCenterSdkService;
import com.freemud.sdk.api.assortment.order.vo.ProductGroupVo;
import com.freemud.sdk.api.assortment.orderdistributor.entity.dto.PaymentMqMessageDto;
import com.freemud.sdk.api.assortment.orderdistributor.service.PaymentQueueService;
import com.freemud.sdk.api.assortment.payment.request.UnifiedOrderRequest;
import com.freemud.sdk.api.assortment.payment.response.OrderRefundResponse;
import com.freemud.sdk.api.assortment.payment.response.UnifiedOrderResponse;
......@@ -123,8 +126,6 @@ public class MallOrderServiceImpl implements MallOrderService {
@Autowired
private OrderAdapter orderAdapter;
@Autowired
private OrderAdapter mallOrderAdapter;
@Autowired
private ItemServiceImpl itemService;
@Autowired
private ShoppingCartClient shoppingCartClient;
......@@ -157,6 +158,8 @@ public class MallOrderServiceImpl implements MallOrderService {
@Autowired
private AssortmentCustomerInfoManager assortmentCustomerInfoManager;
@Autowired
private PaymentQueueService paymentQueueService;
/**
* 创建订单
......@@ -277,7 +280,7 @@ public class MallOrderServiceImpl implements MallOrderService {
OrderExtendedReq orderExtendedReq = orderAdapter.saveStoreInfo(storeResponseDto);
//创建普通订单
Function<Object, CreateOrderResponse> createOrder = (var -> {
BaseCreateOrderRequest baseCreateOrderRequest = mallOrderAdapter.convent2CreateOrderDto(createOrderVo, shoppingCartGoodsDto,storeResponseDto);
BaseCreateOrderRequest baseCreateOrderRequest = orderAdapter.convent2CreateOrderDto(createOrderVo, shoppingCartGoodsDto,storeResponseDto);
//查询第三方商品编号
baseCreateOrderRequest = getProductCustomerCode(baseCreateOrderRequest);
//保存门店渠道信息
......@@ -290,6 +293,7 @@ public class MallOrderServiceImpl implements MallOrderService {
mqMessageRequest.setBackOrdersNotifyActivityExchange(backOrdersNotifyActivityExchange);
mqMessageRequest.setBackOrdersNotifyActivityQueue(backOrdersChangeOrderStatusConsumerQueue);
createOrderRequest.setMqMessageRequest(mqMessageRequest);
createOrderRequest.getBaseCreateOrderRequest().setUserName(userLoginInfoDto.getNickName());
createOrderRequest.setTrackingNo(LogThreadLocal.getTrackingNo());
return orderCenterSdkService.createOrderFlow(createOrderRequest);
});
......@@ -375,12 +379,17 @@ public class MallOrderServiceImpl implements MallOrderService {
public OrderPayResponse getPreOrderPay(QueryOrdersResponse.DataBean.OrderBean orderBean, PaymentRequest paymentRequest, String trackingNo, Integer cardAmount) {
try {
OrderPayResponse orderPayResponse;
UnifiedOrderRequest request = orderAdapter.convent2UnifiedOrderRequest(orderBean, paymentRequest, orderBean.getAmount(), cardAmount, orderBean.getOid());
com.freemud.application.sdk.api.base.BaseResponse<UnifiedOrderResponse> responseBase = standardPaymentService.unifiedOrder(request, trackingNo);
if (!ResponseCodeConstant.RESPONSE_SUCCESS_STR.equals(responseBase.getCode())) {
return null;
ApiLog.info("支付SDK返回信息错误,trackingNo:{} request:{} response:{}", trackingNo, JSONObject.toJSONString(request), JSONObject.toJSONString(responseBase));
// 1.9.34 预支付失败需要把原因进行记录
orderPayResponse = new OrderPayResponse();
orderPayResponse.setMsg(responseBase.getMessage());
return orderPayResponse;
}
OrderPayResponse orderPayResponse = orderAdapter.convent2OrderPayResponse(responseBase.getData());
orderPayResponse = orderAdapter.convent2OrderPayResponse(responseBase.getData());
orderPayResponse.setWxAppid(paymentRequest.getWxAppId());
orderPayResponse.setOpenId(paymentRequest.getOpenId());
orderPayResponse.setPartnerId(orderBean.getCompanyId());
......@@ -389,6 +398,7 @@ public class MallOrderServiceImpl implements MallOrderService {
if (orderPayResponse.getPayOrder() != null && StringUtils.isNotBlank(orderPayResponse.getPayOrder().getAliPayOrder())) {
orderPayResponse.setPayMode(PayChannelType.ALIPAY.getEbcode());
}
putDelMq(request.getPartnerId(), request.getStoreId(), responseBase.getData().getFmId(), orderBean.getOid());
return orderPayResponse;
} catch (Exception e) {
LogUtil.error("getPreOrderPay_error", JSONObject.toJSONString(orderBean), JSONObject.toJSONString(paymentRequest));
......@@ -504,7 +514,6 @@ public class MallOrderServiceImpl implements MallOrderService {
}
}
// 订单支付成功
com.freemud.sdk.api.assortment.order.response.order.PayAccessResponse payAccessRes = orderCenterSdkService.payAccess(confirmOrderRequest);
String string2 = JSONObject.toJSONString(payAccessRes);
......@@ -1061,4 +1070,25 @@ public class MallOrderServiceImpl implements MallOrderService {
}
return result;
}
/**
* 获取预支付成功，将信息放入死心队列，当支付成功没有回掉的时候处理
*
* @param partnerId
* @param storeId
* @param fmId
* @param orderId
*/
public void putDelMq(String partnerId, String storeId, String fmId, String orderId) {
PaymentMqMessageDto dto = new PaymentMqMessageDto();
try {
dto.setFmId(fmId);
dto.setOrderId(orderId);
dto.setPartnerId(partnerId);
dto.setStoreId(storeId);
dto.setTrackingNo(LogThreadLocal.getTrackingNo());
paymentQueueService.paymentCallback(dto);
} catch (Exception e) {
LogUtil.error("paymentQueueService.paymentCallback", "", orderId, e);
}
}
}
order-application-service/src/main/java/cn/freemud/service/impl/OrderAdapterServiceImpl.java
......@@ -333,6 +333,7 @@ public class OrderAdapterServiceImpl implements OrderAdapterService {
orderService.timeOutRefund(orderBean);
return orderAdapter.sendPaySuccessNoticeMessage();
}
/**
* 围餐处理
*/
......
order-application-service/src/main/java/cn/freemud/xxljob/OrderCountJobHandler.java
......@@ -13,18 +13,15 @@ import com.freemud.application.sdk.api.constant.ResponseResultEnum;
import com.freemud.application.sdk.api.log.LogThreadLocal;
import com.freemud.application.sdk.api.ordercenter.response.OrderCountResp;
import com.freemud.application.sdk.api.ordercenter.response.OrderGetPartnerRequest;
import com.freemud.sdk.api.assortment.order.domain.ResponseCodeConstant;
import com.xxl.job.core.biz.model.ReturnT;
import com.xxl.job.core.handler.IJobHandler;
import com.xxl.job.core.handler.annotation.JobHandler;
import lombok.extern.log4j.Log4j2;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.List;
import java.util.Objects;
import java.util.Set;
import java.util.*;
import java.util.stream.Collectors;
......@@ -60,18 +57,30 @@ public class OrderCountJobHandler extends IJobHandler {
OrderGetPartnerRequest build1 = OrderGetPartnerRequest.builder().type(3).build();
// 获取需要 上报的商户号
try {
BaseResponse<GetFilterPartnerResponse> filterPartner = microOpenplatformClient.getFilterPartner(build1);
if (filterPartner == null || filterPartner.getResult() == null) {
LogUtil.info("上报商户号没有数据", build1, filterPartner == null ? null : JSON.toJSONString(filterPartner));
LogUtil.info("上报商户号查询结果", build1, filterPartner == null ? null : JSON.toJSONString(filterPartner));
if (filterPartner == null
|| filterPartner.getResult() == null
|| !ResponseCodeConstant.RESPONSE_SUCCESS_STR.equals(filterPartner.getCode())
|| filterPartner.getResult().getPartnerFilterVos() == null
|| filterPartner.getResult().getPartnerFilterVos().isEmpty()) {
return ReturnT.SUCCESS;
}
OrderCountRequestVo orderCountRequestVo = new OrderCountRequestVo();
Set<String> partnerFilter = getPartnerFilter(filterPartner.getResult());
orderCountRequestVo.setPartnerIds(partnerFilter);
Set<String> partners = getPartnerFilter(filterPartner.getResult());
if (partners.isEmpty()) {
return ReturnT.SUCCESS;
}
orderCountRequestVo.setPartnerIds(partners);
// 时间设置 前一天
setBeginAndEndTime(orderCountRequestVo);
BaseResponse<List<OrderCountResp>> result = orderservice.selectCountOrdersByPartnerIds(orderCountRequestVo, trackingNo);
LogUtil.info("orderCountJobHandlersendreportordercountmsg", orderCountRequestVo, result == null ? null : JSON.toJSONString(result));
if (Objects.isNull(result)) {
return ReturnT.SUCCESS;
}
LogUtil.info("orderCountJobHandlersendreportordercountmsg", orderCountRequestVo, JSON.toJSONString(result));
if (!ResponseResultEnum.SUCCESS.getCode().equalsIgnoreCase(result.getCode()) || Objects.isNull(result.getResult())) {
return ReturnT.SUCCESS;
}
......@@ -80,6 +89,9 @@ public class OrderCountJobHandler extends IJobHandler {
SendOrderCountsMsg build = SendOrderCountsMsg.builder().orders(orderCounts).build();
BaseResponse baseResponse = microOpenplatformClient.addOrderSum(build);
LogUtil.info("orderCountJobHandlersendreportorderend", null, JSON.toJSONString(baseResponse));
} catch (Exception e) {
LogUtil.error("orderCountJobHandlersendreportorderend", null, JSON.toJSONString(e));
}
return ReturnT.SUCCESS;
}
......@@ -106,8 +118,8 @@ public class OrderCountJobHandler extends IJobHandler {
private Set<String> getPartnerFilter(GetFilterPartnerResponse data) {
if (data.getPartnerFilterVos().isEmpty()) {
return null;
if (data.getPartnerFilterVos() == null || data.getPartnerFilterVos().isEmpty()) {
return new HashSet<>();
}
return data.getPartnerFilterVos().stream().map(PartnerFilterResponse::getPartnerId).collect(Collectors.toSet());
}
......
order-management/src/main/java/cn/freemud/management/service/handle/MallOrderHandle.java
......@@ -9,6 +9,7 @@ import cn.freemud.management.util.ResponseUtil;
import com.freemud.application.sdk.api.log.LogThreadLocal;
import com.freemud.application.sdk.api.ordercenter.enums.AfterSalesType;
import com.freemud.application.sdk.api.ordercenter.enums.OrderClientType;
import com.freemud.application.sdk.api.ordercenter.enums.RefundModeEnum;
import com.freemud.application.sdk.api.ordercenter.request.OrderModifyRelatingCodeReq;
import com.freemud.sdk.api.assortment.order.adapter.OrderSdkAdapter;
import com.freemud.sdk.api.assortment.order.enums.PayRefundStatus;
......@@ -58,9 +59,12 @@ public class MallOrderHandle {
public BaseResponse refundAgree(OrderManagerRequest request, PayRefundResponse refundResponse, QueryOrdersResponse.DataBean.OrderBean orderBean) {
BaseQueryOrderRequest refundAgreeRequest = orderSdkAdapter.getRefundAgreeRequest(refundResponse.getRefundId(), request.getReason(), request.getOperator(), orderBean);
BaseOrderResponse baseOrderResponse = null;
if (PayRefundStatus.SUCCESS.equals(refundResponse.getPayRefundStatus())) {
if (PayRefundStatus.SUCCESS.equals(refundResponse.getPayRefundStatus()) && RefundModeEnum.REFUND_ALL.getIndex() == orderBean.getRefundList().get(0).getRefundMode()) {
baseOrderResponse = orderCenterSdkService.mallOrderRefundComplete(refundAgreeRequest);
} else {
}else if(PayRefundStatus.SUCCESS.equals(refundResponse.getPayRefundStatus()) && RefundModeEnum.UN_REFUND_GOODS.getIndex() == orderBean.getRefundList().get(0).getRefundMode()){
baseOrderResponse = orderCenterSdkService.adultApproveWithRefundComplete(refundAgreeRequest);
}
else {
baseOrderResponse = orderCenterSdkService.mallOrderRefundReturn(refundAgreeRequest);
}
if (baseOrderResponse == null || ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(), baseOrderResponse.getErrcode().toString())) {
......
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java
......@@ -558,7 +558,7 @@ public class ShoppingCartMCoffeeServiceImpl {
return ResponseUtil.success(shoppingCartGoodsResponseVo);
}
if (cartGoodsUid.equals(cartGoods_.getCartGoodsUid())) {
if (cartGoods_.getIsMonthCard() == 1 && qty == 0){
if (cartGoods_.getIsMonthCard() == 1 && cartGoods_.getMonthCardInfo() != null && qty != null && qty == 0){
cartGoodsList = clearMonthCouponInfo(cartGoodsList,cartGoods_.getMonthCardInfo().getCardCode(),cartGoodsUid);
}
cartGoods = cartGoods_;
......@@ -1148,6 +1148,16 @@ public class ShoppingCartMCoffeeServiceImpl {
for (CartGoods cartGoods : cartGoodsList) {
onlyCheckGoodsList.addAll(checkCartGoods(partnerId, toStoreId, orderType, menuType, shoppingCartGoodsResponseVo, Arrays.asList(cartGoods), sessionId));
}
}else{
// 新门店check购物车中所有商品
List<CartGoods> temList = new ArrayList<>();
for (CartGoods goods : cartGoodsList) {
temList.addAll(checkCartGoods(partnerId, toStoreId, orderType, menuType, shoppingCartGoodsResponseVo, Arrays.asList(goods), sessionId));
}
cartGoodsList = temList;
}
if (requestVo.getOperationType() == ShoppingCartOperationType.CHECK.getCode()) {
if (StringUtils.isNotEmpty(shoppingCartGoodsResponseVo.getToastMsg())){
//设置更新响应信息,校验失败只弹框提示消息，不切换门店，故将门店id重置为原来门店
shoppingCartGoodsResponseVo.setProducts(cartGoodsList);
......@@ -1729,9 +1739,15 @@ public class ShoppingCartMCoffeeServiceImpl {
//套餐固定商品赋值
if (CollectionUtils.isNotEmpty(productBeanListSpuClass.get(0).getProductComboList()) && CollectionUtils.isNotEmpty(cartGoods.getProductComboList())){
Map<String, Integer> productMap = productBeanListSpuClass.get(0).getProductComboList().stream()
.collect(Collectors.toMap(ProductBeanDTO.ProductComboType::getProductId, ProductBeanDTO.ProductComboType::getQuantity, (k1,k2) -> k1+k2));
if(StringUtils.isNotBlank(cartGoods.getCouponCode())) {
for (CartGoods.ComboxGoods comboxGoods : cartGoods.getProductComboList()) {
comboxGoods.setQty(productMap.get(comboxGoods.getGoodsId()));
}
} else {
Map<String, Integer> cartGoodsMap = cartGoods.getProductComboList().stream()
.collect(Collectors.toMap(
o -> (StringUtils.isBlank(o.getSpuId()) || "0".equals(o.getSpuId()))?o.getSkuId():o.getSpuId(),
......@@ -1742,6 +1758,7 @@ public class ShoppingCartMCoffeeServiceImpl {
throw new ServiceException(ResponseResult.SHOPPING_CART_VERSION_ERROR, "加购套餐子商品数量异常");
}
}
}
//套餐可选商品赋值
// if (CollectionUtils.isNotEmpty(productBeanListSpuClass.get(0).getProductGroupList())){
......
shopping-cart-application-service/src/test/java/cn.freemud/service/ShoppingCartMCoffeeServiceTest.java 0 → 100644
/**
* All rights Reserved, Designed By www.freemud.cn
*
* @Title: ShoppingCartNewServiceTest
* @Package cn.freemud.service
* @Description:
* @author: song.cai
* @date: 2019/1/23 16:56
* @version V1.0
* @Copyright: 2019 www.freemud.cn Inc. All rights reserved.
* 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
*/
package cn.freemud.service;
import cn.freemud.base.entity.BaseResponse;
import cn.freemud.entities.dto.shoppingCart.ShoppingCartGoodsDto;
import cn.freemud.entities.vo.*;
import cn.freemud.enums.ResponseResult;
import cn.freemud.service.impl.ShoppingCartMealServiceImpl;
import cn.freemud.service.impl.mcoffee.ShoppingCartMCoffeeServiceImpl;
import cn.freemud.service.impl.mcoffee.entity.MCoffeeAddGoodsRequestVo;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.freemud.sdk.api.assortment.shoppingcart.constant.MealClearOperationEnum;
import lombok.extern.slf4j.Slf4j;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
import org.springframework.cloud.openfeign.EnableFeignClients;
import org.springframework.test.context.junit4.SpringRunner;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
@Slf4j
@RunWith(SpringRunner.class)
@SpringBootTest
@EnableDiscoveryClient
@EnableFeignClients
@EnableAutoConfiguration
public class ShoppingCartMCoffeeServiceTest {
@Autowired
private ShoppingCartMCoffeeServiceImpl shoppingCartMCoffeeService;
@Test
public void f1() {
shoppingCartMCoffeeService.addGoods(JSON.parseObject("{\"appId\":\"wx6816a0b007741702\",\"channelType\":\"saas\",\"couponCode\":\"601153527093109\",\"couponType\":0,\"extra\":[],\"isMonthCard\":0,\"isMonthCardGoods\":0,\"isSunnyCoupon\":0,\"menuType\":\"saas\",\"orderType\":1,\"partnerId\":\"1628\",\"productComboList\":[{\"extra\":[],\"productMaterialList\":[],\"skuId\":\"204903200109635372\"}],\"productGroupList\":[],\"qty\":1,\"receiveId\":\"\",\"sessionId\":\"408cc5c5ce3967f849859d1cd11000ab1cf34729\",\"shopId\":\"99998\",\"skuId\":\"204906489299783199\",\"spuId\":\"204906489299783199\"}", MCoffeeAddGoodsRequestVo.class));
}
}
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