华莱士

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

@@ -265,10 +265,12 @@ public class SpellGroupOrderAdapter {
     }
 
     public QueryDeliveryTemplateRequest convertToQueryDeliveryTemplateRequest(CreateSpellGroupOrderDto createSpellGroupOrderDto) {
-        return new QueryDeliveryTemplateRequest(createSpellGroupOrderDto.getPartnerId(),
-                createSpellGroupOrderDto.getProvince(),
-                createSpellGroupOrderDto.getActivityCalculationDiscountResponseDto().getResult().getTotalAmount().intValue(),
-                createSpellGroupOrderDto.getProducts().size());
+        QueryDeliveryTemplateRequest  queryDeliveryTemplateRequest = new QueryDeliveryTemplateRequest();
+        queryDeliveryTemplateRequest.setPartnerId(createSpellGroupOrderDto.getPartnerId());
+        queryDeliveryTemplateRequest.setProvince(createSpellGroupOrderDto.getProvince());
+        queryDeliveryTemplateRequest.setOrderAmount(createSpellGroupOrderDto.getActivityCalculationDiscountResponseDto().getResult().getTotalAmount().intValue());
+        queryDeliveryTemplateRequest.setCount(createSpellGroupOrderDto.getProducts().size());
+        return queryDeliveryTemplateRequest;
     }
 
     public GroupWorkRefundRequest convertToGroupWorkRefundRequest(String activityCode, String groupId, String orderId, String userId) {

order-application-service/src/main/java/cn/freemud/controller/SpellGroupOrderController.java

 package cn.freemud.controller;
 
 import cn.freemud.base.entity.BaseResponse;
+import cn.freemud.entities.dto.delivery.QueryDeliveryTemplateRequest;
 import cn.freemud.entities.vo.CreateSpellGroupOrderReq;
 import cn.freemud.service.Orderservice;
 import cn.freemud.service.SpellGroupOrderService;
@@ -36,4 +37,13 @@ public class SpellGroupOrderController {
         return spellGroupOrderService.createSpellGroupOrder(request);
     }
 
+    @ApiOperation(value = "查询配送费", notes = "查询配送费", produces = "application/json")
+    @ApiAnnotation(logMessage = "querySaasMallDeliveryAmount")
+    @PostMapping("/querySaasMallDeliveryAmount")
+    public BaseResponse querySaasMallDeliveryAmount(@LogParams @RequestBody QueryDeliveryTemplateRequest request) {
+        return spellGroupOrderService.queryDeliveryAmount(request);
+    }
+
+
+
 }

order-application-service/src/main/java/cn/freemud/entities/dto/delivery/QueryDeliveryTemplateRequest.java

@@ -2,6 +2,9 @@ package cn.freemud.entities.dto.delivery;
 
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+
 /**
  * @author wanghanghang
  * @title: QueryDeliveryTemplateRequest
@@ -11,6 +14,7 @@ import lombok.Data;
  */
 @Data
 public class QueryDeliveryTemplateRequest {
+
     private String partnerId;
 
     private String province;
@@ -19,11 +23,4 @@ public class QueryDeliveryTemplateRequest {
 
     private Integer count;
 
-
-    public QueryDeliveryTemplateRequest(String partnerId,String province,Integer orderAmount,Integer count){
-        this.partnerId = partnerId;
-        this.province = province;
-        this.orderAmount = orderAmount;
-        this.count = count;
-    }
 }

order-application-service/src/main/java/cn/freemud/service/SpellGroupOrderService.java

 package cn.freemud.service;
 
 import cn.freemud.base.entity.BaseResponse;
+import cn.freemud.entities.dto.delivery.QueryDeliveryTemplateRequest;
 import cn.freemud.entities.vo.CreateSpellGroupOrderReq;
 
 /**
@@ -19,4 +20,6 @@ public interface SpellGroupOrderService {
      */
     public BaseResponse createSpellGroupOrder(CreateSpellGroupOrderReq createSpellGroupOrderReq);
 
+    public BaseResponse queryDeliveryAmount(QueryDeliveryTemplateRequest request);
+
 }

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

@@ -158,7 +158,7 @@ public class SpellGroupOrderServiceImpl implements SpellGroupOrderService {
         }
         //促销和产品给出规则，如果促销返回的价格是商品原价，则表示库存不足或者活动关闭 == 拼团的商品价格，肯定比商品原价低
         if (activityCalculationDiscountResponseDto.getResult().getTotalAmount().equals(productInfosDto.get(0).getOriginalPrice())) {
-            return ResponseUtil.error(ResponseResult.SPELL_GROUP_ACTIVITE_AMOUNT_ERROR);
+//       todo     return ResponseUtil.error(ResponseResult.SPELL_GROUP_ACTIVITE_AMOUNT_ERROR);
         }
         createSpellGroupOrderDto.setActivityCalculationDiscountResponseDto(activityCalculationDiscountResponseDto);
         //转换费用信息->查询配送费
@@ -187,6 +187,15 @@ public class SpellGroupOrderServiceImpl implements SpellGroupOrderService {
         return orderService.createPrepayOrder(createPrepayRequestDto);
     }
 
+    @Override
+    public BaseResponse queryDeliveryAmount(QueryDeliveryTemplateRequest request) {
+        QueryDeliveryTemplateResponse queryDeliveryTemplateResponse = spellGroupOrderDataManager.queryDeliveryTemplate(request);
+        if(queryDeliveryTemplateResponse == null){
+            return ResponseUtil.error(ResponseResult.SPELL_GROUP_QUERY_DELIVERYTEMPLATE_ERROR);
+        }
+        return ResponseUtil.success(queryDeliveryTemplateResponse.getData());
+    }
+
     /**
      * 扣减动库存
      * @param orderBean