积分商城

order-application-service/src/main/java/cn/freemud/service/impl/PointsMallOrderServiceImpl.java

@@ -6,6 +6,7 @@ import cn.freemud.base.util.DateUtil;
 import cn.freemud.entities.Active;
 import cn.freemud.entities.dto.BatchQueryActivityInfoRequestDto;
 import cn.freemud.entities.dto.BatchQueryActivityInfoResponseDto;
+import cn.freemud.entities.dto.delivery.WeixinDeliveryAddressDto;
 import cn.freemud.entities.dto.product.pointsmall.*;
 import cn.freemud.entities.dto.user.CustomerPropertyBaseResponse;
 import cn.freemud.entities.dto.user.StatislScoreResponse;
@@ -91,6 +92,7 @@ public class PointsMallOrderServiceImpl implements PointsMallOrderService {
         PointMallListProductInfoRequest productInfoRequest = new PointMallListProductInfoRequest();
         productInfoRequest.setPartnerId(partnerId);
         productInfoRequest.setMemberId(memberId);
+        productInfoRequest.setProductIdList(Arrays.asList(skuId));
         productInfoRequest.setValidateMember(true);
         productInfoRequest.setValidateStock(true);
         productInfoRequest.setValidateTime(true);
@@ -108,6 +110,10 @@ public class PointsMallOrderServiceImpl implements PointsMallOrderService {
         Integer points = integralProductType.getIntegralPrice();
         Integer exchangeType = integralProductType.getExchangeType();
         boolean isCoupon = integralProductType.getProductType() == 1;
+        WeixinDeliveryAddressDto weixinDeliveryAddress = createOrderVo.getWeixinDeliveryAddress();
+        if(!isCoupon && (weixinDeliveryAddress == null || StringUtils.isEmpty(weixinDeliveryAddress.getProvinceName()))) {
+            return ResponseUtil.error("101", "收货地址异常");
+        }
         Active active = null;
         if (isCoupon) {
             String activityCode = integralProductType.getCouponCode();
@@ -136,10 +142,9 @@ public class PointsMallOrderServiceImpl implements PointsMallOrderService {
                 return ResponseUtil.error(statislScoreResponseBaseResponse.getCode(), "积分不足");
             }
         }
-
         //创建订单
         CreateOrderRequest createOrderRequest = convent2NEWCreateOrderRequest(OrderClientType.I_MEMBER.getIndex(), userLoginInfoDto,
-                storeId, "", "", 4, integralProductType, skuId, active);
+                storeId, "", "", 4, integralProductType, skuId, active, weixinDeliveryAddress);
         com.freemud.application.sdk.api.ordercenter.response.BaseResponse<OrderInfoReqs> createOrderResponseDto = orderSdkService.createOrder(createOrderRequest, "");
         if (!Objects.equals("100", createOrderResponseDto.getCode())) {
             return ResponseUtil.error(createOrderResponseDto.getCode(), "创建订单异常");
@@ -439,7 +444,7 @@ public class PointsMallOrderServiceImpl implements PointsMallOrderService {
                                                              String shopId, String cardCode,
                                                              String channel, Integer bizType,
                                                              IntegralProductType productBean, String skuId,
-                                                             Active active) {
+                                                             Active active,WeixinDeliveryAddressDto weixinDeliveryAddress) {
         CreateOrderRequest request = new CreateOrderRequest();
         String partnerId = userLoginInfoDto.getPartnerId();
         request.setOrderClient(orderClient);
@@ -492,6 +497,11 @@ public class PointsMallOrderServiceImpl implements PointsMallOrderService {
         deliveryContactInfoCreateReq.setProvince(null);
         deliveryContactInfoCreateReq.setCity(null);
         deliveryContactInfoCreateReq.setRegion(null);
+        if(weixinDeliveryAddress != null){
+            deliveryContactInfoCreateReq.setContactsName(weixinDeliveryAddress.getUserName());
+            deliveryContactInfoCreateReq.setMobile(weixinDeliveryAddress.getTelNumber());
+            deliveryContactInfoCreateReq.setAddressDetail(weixinDeliveryAddress.getDetailInfo());
+        }
         deliveryContactInfoList.add(deliveryContactInfoCreateReq);
         request.setDeliveryContactInfoList(deliveryContactInfoList);
         request.setOperator(userLoginInfoDto.getNickName());