优化

mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/AreaMgrController.java

@@ -7,6 +7,11 @@ import com.qs.mp.common.service.IAreaService;
 import com.qs.mp.web.controller.common.BaseApiController;
 import java.util.List;
 import javax.validation.Valid;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -21,8 +26,10 @@ import org.springframework.web.bind.annotation.RestController;
 /**
  * @author lgh on 2018/10/26.
  */
+
 @RestController
 @RequestMapping("/api/v1/mp")
+@Api(tags = "区域管理接口")
 public class AreaMgrController extends BaseApiController {
 
     @Autowired
@@ -32,6 +39,10 @@ public class AreaMgrController extends BaseApiController {
      * 分页获取
      */
     @GetMapping("/admin/area/list")
+    @ApiOperation("分页获取")
+    @ApiResponses(
+            @ApiResponse(code = 200, message = "成功", response = Area.class)
+    )
 //    @PreAuthorize("@pms.hasPermission('admin:area:page')")
     public TableDataInfo page(Area area) {
         startPage();
@@ -43,6 +54,10 @@ public class AreaMgrController extends BaseApiController {
      * 获取省市
      */
     @GetMapping("/list")
+    @ApiOperation("获取省市")
+    @ApiResponses(
+            @ApiResponse(code = 200, message = "成功", response = Area.class)
+    )
 //    @PreAuthorize("@pms.hasPermission('admin:area:list')")
     public ResponseEntity<List<Area>> list(Area area) {
         List<Area> areas = areaService.list(new LambdaQueryWrapper<Area>()
@@ -54,6 +69,10 @@ public class AreaMgrController extends BaseApiController {
      * 通过父级id获取区域列表
      */
     @GetMapping("/listByPid")
+    @ApiOperation("通过父级id获取区域列表")
+    @ApiResponses(
+            @ApiResponse(code = 200, message = "成功", response = Area.class)
+    )
     public ResponseEntity<List<Area>> listByPid(Long pid) {
         List<Area> list = areaService.listByPid(pid);
         return ResponseEntity.ok(list);
@@ -63,6 +82,10 @@ public class AreaMgrController extends BaseApiController {
      * 获取信息
      */
     @GetMapping("/info/{id}")
+    @ApiOperation("获取信息")
+    @ApiResponses(
+            @ApiResponse(code = 200, message = "成功", response = Area.class)
+    )
 //    @PreAuthorize("@pms.hasPermission('admin:area:info')")
     public ResponseEntity<Area> info(@PathVariable("id") Long id) {
         Area area = areaService.getById(id);
@@ -73,6 +96,10 @@ public class AreaMgrController extends BaseApiController {
      * 保存
      */
     @PostMapping
+    @ApiOperation("保存")
+    @ApiResponses(
+            @ApiResponse(code = 200, message = "成功", response = Area.class)
+    )
 //    @PreAuthorize("@pms.hasPermission('admin:area:save')")
     public ResponseEntity<Void> save(@Valid @RequestBody Area area) {
         if (area.getParentId() != null) {

mp-admin/src/main/java/com/qs/mp/web/controller/api/user/UserDeliverOrderController.java

@@ -47,6 +47,7 @@ import io.swagger.annotations.ApiResponses;
 import lombok.AllArgsConstructor;
 import ma.glasnost.orika.MapperFacade;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -57,7 +58,6 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("/api/v1/mp/user/deliver")
 @Api(tags = "用户端奖品提货接口")
-@AllArgsConstructor
 public class UserDeliverOrderController extends BaseApiController {
 
   @Autowired
@@ -87,6 +87,9 @@ public class UserDeliverOrderController extends BaseApiController {
   @Autowired
   private IShippingTemplateRuleService shippingTemplateRuleService;
 
+  @Value("${shipping.user}")
+  public String shippingTemplateId;
+
   /**
    * 订单列表
    */
@@ -177,7 +180,7 @@ public class UserDeliverOrderController extends BaseApiController {
     // 计算运费
     UserAddr userAddr = orderSettleVO.getAddr();
     // TODO: 4L上线需要调整,后期放开就是取的商品里配的运费模板id
-    ShippingTemplateCalculateVO shippingTemplateCalculateVO = shippingTemplateRuleService.getShippingTemplateRuleByTemplateIdAndAreaInfo(4L, userAddr.getProvinceId(), userAddr.getCityId());
+    ShippingTemplateCalculateVO shippingTemplateCalculateVO = shippingTemplateRuleService.getShippingTemplateRuleByTemplateIdAndAreaInfo(Long.getLong(shippingTemplateId), userAddr.getProvinceId(), userAddr.getCityId());
     // 无法查到运费模板则默认为0
     if (Objects.nonNull(shippingTemplateCalculateVO)) {
 
@@ -186,7 +189,7 @@ public class UserDeliverOrderController extends BaseApiController {
 
       if (ShippingTemplateRuleTypeEnum.SHIP.getValue().equals(shippingTemplateCalculateVO.getType())) {
         int goodsNum = prizeStorageList.stream().mapToInt(UserPrizeStorage::getGoodsNum).sum();
-        freightAmt = shippingTemplateCalculateVO.getDefaultNumber();
+        freightAmt = shippingTemplateCalculateVO.getDefaultPrice();
         if (goodsNum - shippingTemplateCalculateVO.getDefaultNumber() >= shippingTemplateCalculateVO.getCreateNumber()) {
 
           // 运费:首件价格 + ((商品数量 - 首件数量) / 续件数量)向上取整 * 续件价格

mp-admin/src/main/resources/application-test.yml

@@ -136,3 +136,7 @@ miniprogram:
 # 盲票导出每页查询数量
 export:
   page-size: 200
+
+shipping:
+  user: 4
+  channel: 7

mp-service/src/main/java/com/qs/mp/common/domain/Area.java

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
 import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -13,20 +15,25 @@ import lombok.Data;
  * @auther quanshu
  * @create 2022-03-02 11:23:04
  */
+@ApiModel("区域实体类")
 @TableName("mp_area")
 @Data
 public class Area implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @TableId(value = "area_id", type = IdType.AUTO)
+    @ApiModelProperty("区域id")
     private Long areaId;
 
+    @ApiModelProperty("区域名称")
     @TableField("area_name")
     private String areaName;
 
+    @ApiModelProperty("上级id")
     @TableField("parent_id")
     private Long parentId;
 
+    @ApiModelProperty("级别")
     @TableField("level")
     private Integer level;
 

mp-service/src/main/java/com/qs/mp/common/service/IShippingTemplateRuleService.java

@@ -22,5 +22,5 @@ public interface IShippingTemplateRuleService extends IService<ShippingTemplateR
      * @param cityId             城市id
      * @return
      */
-    ShippingTemplateCalculateVO getShippingTemplateRuleByTemplateIdAndAreaInfo(long shippingTemplateId, Long provinceId, Long cityId);
+    ShippingTemplateCalculateVO getShippingTemplateRuleByTemplateIdAndAreaInfo(Long shippingTemplateId, Long provinceId, Long cityId);
 }

mp-service/src/main/java/com/qs/mp/common/service/impl/ShippingTemplateRuleServiceImpl.java

@@ -22,7 +22,7 @@ import org.springframework.stereotype.Service;
 public class ShippingTemplateRuleServiceImpl extends ServiceImpl<ShippingTemplateRuleMapper, ShippingTemplateRule> implements IShippingTemplateRuleService {
 
     @Override
-    public ShippingTemplateCalculateVO getShippingTemplateRuleByTemplateIdAndAreaInfo(long shippingTemplateId, Long provinceId, Long cityId) {
+    public ShippingTemplateCalculateVO getShippingTemplateRuleByTemplateIdAndAreaInfo(Long shippingTemplateId, Long provinceId, Long cityId) {
         QueryWrapper<ShippingTemplateRule> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("t1.id", shippingTemplateId);
         queryWrapper.eq("t3.province_id", provinceId);