华莱士

order-application-service/src/main/java/cn/freemud/adapter/SpellGroupOrderAdapter.java

@@ -66,9 +66,9 @@ public class SpellGroupOrderAdapter {
         //运费
         long freight = 1000 ;
         //判断是否包邮，包邮的话运费为0 todo
-//        if (!createSpellGroupOrderDto.getDeliveryTemplateInfoVo().isDispatchFree()) {
-//            freight = createSpellGroupOrderDto.getDeliveryTemplateInfoVo().getFreight();
-//        }
+        if (!createSpellGroupOrderDto.getDeliveryTemplateInfoVo().isDispatchFree()) {
+            freight = createSpellGroupOrderDto.getDeliveryTemplateInfoVo().getFreight();
+        }
         ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscount = createSpellGroupOrderDto.getActivityCalculationDiscountResponseDto().getResult();
         createOrderRequest.setActualPayAmount(calculationDiscount.getTotalAmount().longValue() + freight); //加配送费
         createOrderRequest.setSettlementAmount(calculationDiscount.getTotalAmount().longValue() + freight);
@@ -273,15 +273,15 @@ public class SpellGroupOrderAdapter {
     public void convertToReceiveAddress(QueryReceiveAddressResponse receiveAddressResult, CreateSpellGroupOrderDto createSpellGroupOrderDto) {
         DeliveryContactInfoCreateReq deliveryContactInfoCreateReq = new DeliveryContactInfoCreateReq();
         deliveryContactInfoCreateReq.setRelateObjectType(1);
-//        deliveryContactInfoCreateReq.setAddressDetail(receiveAddressResult.getReceiveAddress());
-        deliveryContactInfoCreateReq.setAddressDetail("receiveAddressResult.getReceiveAddress()");
+        deliveryContactInfoCreateReq.setAddressDetail(receiveAddressResult.getReceiveAddress());
+//        deliveryContactInfoCreateReq.setAddressDetail("receiveAddressResult.getReceiveAddress()");
         deliveryContactInfoCreateReq.setInfoType(1);
-//        deliveryContactInfoCreateReq.setLatitude(new BigDecimal(receiveAddressResult.getLatitude()));
-//        deliveryContactInfoCreateReq.setLongitude(new BigDecimal(receiveAddressResult.getLongitude()));
-//        deliveryContactInfoCreateReq.setMobile(StringUtils.isEmpty(receiveAddressResult.getMobile()) ? receiveAddressResult.getReceiveMobile() : receiveAddressResult.getMobile());
-        deliveryContactInfoCreateReq.setMobile("18516602251");
-//        deliveryContactInfoCreateReq.setContactsName(receiveAddressResult.getReceiveName());
-        deliveryContactInfoCreateReq.setContactsName("receiveAddressResult.getReceiveName()");
+        deliveryContactInfoCreateReq.setLatitude(new BigDecimal(receiveAddressResult.getLatitude()));
+        deliveryContactInfoCreateReq.setLongitude(new BigDecimal(receiveAddressResult.getLongitude()));
+        deliveryContactInfoCreateReq.setMobile(StringUtils.isEmpty(receiveAddressResult.getMobile()) ? receiveAddressResult.getReceiveMobile() : receiveAddressResult.getMobile());
+//        deliveryContactInfoCreateReq.setMobile("18516602251");
+        deliveryContactInfoCreateReq.setContactsName(receiveAddressResult.getReceiveName());
+//        deliveryContactInfoCreateReq.setContactsName("receiveAddressResult.getReceiveName()");
         List<DeliveryContactInfoCreateReq> list = new ArrayList<>();
         list.add(deliveryContactInfoCreateReq);
         createSpellGroupOrderDto.setDeliveryContactInfoCreateReqList(list);

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

@@ -151,7 +151,7 @@ public class SpellGroupOrderServiceImpl implements SpellGroupOrderService {
         /*查询配送地址等信息->转换至DTO*/
         QueryReceiveAddressResponse queryReceiveAddressResponse = spellGroupOrderDataManager.queryOrderReceiveAddress(createSpellGroupOrderReq.getReceiveId(), createSpellGroupOrderReq.getPartnerId(), trackingNo);
         if(queryReceiveAddressResponse == null){
-//            return ResponseUtil.error(ResponseResult.SPELL_GROUP_QUERY_ORDER_RECEIVE_ADDRESS_ERROR);
+            return ResponseUtil.error(ResponseResult.SPELL_GROUP_QUERY_ORDER_RECEIVE_ADDRESS_ERROR);
         }
         spellGroupOrderAdapter.convertToReceiveAddress(queryReceiveAddressResponse, createSpellGroupOrderDto);
         /*查询商品信息*/
@@ -168,7 +168,7 @@ public class SpellGroupOrderServiceImpl implements SpellGroupOrderService {
         }
         //促销和产品给出规则，如果促销返回的价格是商品原价，则表示库存不足或者活动关闭 == 拼团的商品价格，肯定比商品原价低
         if (activityCalculationDiscountResponseDto.getResult().getTotalAmount().equals(productInfosDto.get(0).getOriginalPrice())) {
-//            return ResponseUtil.error(ResponseResult.SPELL_GROUP_ACTIVITE_AMOUNT_ERROR);
+            return ResponseUtil.error(ResponseResult.SPELL_GROUP_ACTIVITE_AMOUNT_ERROR);
         }
         createSpellGroupOrderDto.setActivityCalculationDiscountResponseDto(activityCalculationDiscountResponseDto);
 
@@ -176,10 +176,10 @@ public class SpellGroupOrderServiceImpl implements SpellGroupOrderService {
         QueryDeliveryTemplateRequest queryDeliveryTemplateRequest = spellGroupOrderAdapter.convertToQueryDeliveryTemplateRequest(createSpellGroupOrderDto);
         QueryDeliveryTemplateResponse queryDeliveryTemplateResponse = spellGroupOrderDataManager.queryDeliveryTemplate(queryDeliveryTemplateRequest);
         if(queryDeliveryTemplateResponse == null ){
-//         return ResponseUtil.error(ResponseResult.SPELL_GROUP_QUERY_DELIVERYTEMPLATE_ERROR);
+            return ResponseUtil.error(ResponseResult.SPELL_GROUP_QUERY_DELIVERYTEMPLATE_ERROR);
         }
         //转换类存入费用信息->配送费
-//        createSpellGroupOrderDto.setDeliveryTemplateInfoVo(queryDeliveryTemplateResponse.getData());
+        createSpellGroupOrderDto.setDeliveryTemplateInfoVo(queryDeliveryTemplateResponse.getData());
 
         //DTO转换为订单Request信息
         com.freemud.application.sdk.api.ordercenter.request.create.CreateOrderRequest createOrderRequest = spellGroupOrderAdapter.convertToCreateOrderRequest(createSpellGroupOrderDto, userLoginInfoDto);