后端代码逻辑优化

vehicle-client/src/main/java/com/chelvc/cloud/vehicle/client/dto/MerchantDTO.java

@@ -90,12 +90,12 @@ public class MerchantDTO implements Serializable {
     /**
      * 经度
      */
-    private Double longitude;
+//    private Double longitude;
 
     /**
      * 纬度
      */
-    private Double latitude;
+//    private Double latitude;
 
     /**
      * 是否推荐

vehicle-client/src/main/java/com/chelvc/cloud/vehicle/client/dto/OmsOrderDTO.java

@@ -54,19 +54,19 @@ public class OmsOrderDTO implements Serializable
     private BigDecimal payAmount;
 
     /** 运费金额 */
-    private BigDecimal freightAmount;
+//    private BigDecimal freightAmount;
 
     /** 促销优化金额（促销价、满减、阶梯价） */
-    private BigDecimal promotionAmount;
+//    private BigDecimal promotionAmount;
 
     /** 积分抵扣金额 */
-    private BigDecimal integrationAmount;
+//    private BigDecimal integrationAmount;
 
     /** 优惠券抵扣金额 */
-    private BigDecimal couponAmount;
+//    private BigDecimal couponAmount;
 
     /** 管理员后台调整订单使用的折扣金额 */
-    private BigDecimal discountAmount;
+//    private BigDecimal discountAmount;
 
     /** 支付方式：0->未支付；1->支付宝；2->微信 */
     private Integer payType;
@@ -78,40 +78,40 @@ public class OmsOrderDTO implements Serializable
     private Integer status;
 
     /** 订单类型：0->正常订单；1->秒杀订单 */
-    private Integer orderType;
+//    private Integer orderType;
 
     /** 物流公司(配送方式) */
-    private String deliveryCompany;
+//    private String deliveryCompany;
 
     /** 物流单号 */
-    private String deliverySn;
+//    private String deliverySn;
 
     /** 自动确认时间（天） */
     private Integer autoConfirmDay;
 
     /** 可以获得的积分 */
-    private Integer integration;
+//    private Integer integration;
 
     /** 可以活动的成长值 */
-    private Integer growth;
+//    private Integer growth;
 
     /** 活动信息 */
-    private String promotionInfo;
+//    private String promotionInfo;
 
     /** 发票类型：0->不开发票；1->电子发票；2->纸质发票 */
-    private Integer billType;
+//    private Integer billType;
 
     /** 发票抬头 */
-    private String billHeader;
+//    private String billHeader;
 
     /** 发票内容 */
-    private String billContent;
+//    private String billContent;
 
     /** 收票人电话 */
-    private String billReceiverPhone;
+//    private String billReceiverPhone;
 
     /** 收票人邮箱 */
-    private String billReceiverEmail;
+//    private String billReceiverEmail;
 
     /** 收货人姓名 */
     private String receiverName;
@@ -138,22 +138,22 @@ public class OmsOrderDTO implements Serializable
     private String note;
 
     /** 确认收货状态：0->未确认；1->已确认 */
-    private Integer confirmStatus;
+//    private Integer confirmStatus;
 
     /** 删除状态：0->未删除；1->已删除 */
-    private Integer deleteStatus;
+//    private Integer deleteStatus;
 
     /** 下单时使用的积分 */
-    private Integer useIntegration;
+//    private Integer useIntegration;
 
     /** 支付时间 */
     private Date paymentTime;
 
     /** 发货时间 */
-    private Date deliveryTime;
+//    private Date deliveryTime;
 
     /** 确认收货时间 */
-    private Date receiveTime;
+//    private Date receiveTime;
 
     /** 评价时间 */
     private Date commentTime;

vehicle-client/src/main/java/com/chelvc/cloud/vehicle/client/dto/OmsOrderItemDTO.java

@@ -39,7 +39,7 @@ public class OmsOrderItemDTO implements Serializable
     private String goodsName;
 
     /** $column.columnComment */
-    private String goodsBrand;
+//    private String goodsBrand;
 
     /** $column.columnComment */
     private String goodsSn;
@@ -51,28 +51,28 @@ public class OmsOrderItemDTO implements Serializable
     private Integer goodsQuantity;
 
     /** 商品sku编号 */
-    private Long goodsSkuId;
+//    private Long goodsSkuId;
 
     /** 商品sku条码 */
-    private String goodsSkuCode;
+//    private String goodsSkuCode;
 
     /** 商品分类id */
     private Long goodsCategoryId;
 
     /** 商品促销名称 */
-    private String promotionName;
+//    private String promotionName;
 
     /** 商品促销分解金额 */
-    private BigDecimal promotionAmount;
+//    private BigDecimal promotionAmount;
 
     /** 优惠券优惠分解金额 */
-    private BigDecimal couponAmount;
+//    private BigDecimal couponAmount;
 
     /** 积分优惠分解金额 */
-    private BigDecimal integrationAmount;
+//    private BigDecimal integrationAmount;
 
     /** 该商品经过优惠后的分解金额 */
-    private BigDecimal realAmount;
+//    private BigDecimal realAmount;
 
     /** $column.columnComment */
     private Long giftIntegration;
@@ -80,7 +80,7 @@ public class OmsOrderItemDTO implements Serializable
     /** $column.columnComment */
     private Integer giftGrowth;
 
-    private String goodsAttr;
+//    private String goodsAttr;
 
     /**
      * 是否评论  0-未评论；1-已评论

vehicle-client/src/main/java/com/chelvc/cloud/vehicle/client/param/HelpCategoryModifyParam.java

@@ -35,7 +35,7 @@ public class HelpCategoryModifyParam implements Serializable
     /** 分类图标 */
     private String icon;
     /**
-     * 分类类型  0-帮助中心 1-规则中心 2-佣金中心
+     * 分类类型  0-帮助中心 1-规则中心 2-佣金中心 3-开店说明
      */
     @NotNull(message = "类型不能为空")
     private Integer type;

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/MerchantServiceImpl.java

@@ -96,6 +96,9 @@ public class MerchantServiceImpl extends ServiceImpl<MerchantMapper, Merchant> i
     @Override
     public List<MerchantDTO> listRecommendMerchants(@NonNull LocationQueryParam param, int size) {
         List<MerchantDTO> list = this.baseMapper.listRecommendMerchants(param, size);
+        if(CollectionUtils.isEmpty(list)){
+            return new ArrayList<>();
+        }
         list.forEach(item ->{
             item.setMainBusinessName(this.categoryService.getById(item.getMainBusiness()).getName());
         });

vehicle-server/src/main/resources/mapper/OmsOrderMapper.xml

@@ -953,10 +953,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="queryOrderManage" resultType="com.chelvc.cloud.vehicle.client.dto.OrderDTO">
         SELECT
-            count(if(status = 4,true,null)) as verifyNum,
+            count(if(status = 3,true,null)) as verifyNum,
             SUM(CASE WHEN status = 4 THEN pay_amount ELSE 0 END) as verifyAmount,
-            count(CASE WHEN status in (1,2,3) THEN true ELSE null END) as awaitNum,
-            SUM(CASE WHEN status in (1,2,3) THEN pay_amount ELSE 0 END) as awaitAmount
+            count(CASE WHEN status in (1,2) THEN true ELSE null END) as awaitNum,
+            SUM(CASE WHEN status in (1,2) THEN pay_amount ELSE 0 END) as awaitAmount
         FROM
             oms_order
         WHERE
@@ -965,10 +965,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="queryTeamOrder" resultType="com.chelvc.cloud.vehicle.client.dto.MerchantTeamDTO">
         SELECT
-            count(if(o.status = 4,true,null)) as popularizeNum,
-            SUM(CASE WHEN o.status = 4 THEN o.pay_amount ELSE 0 END) as popularizeAmount,
-            count(CASE WHEN o.status in (1,2,3) THEN true ELSE null END) as awaitNum,
-            SUM(CASE WHEN o.status in (1,2,3) THEN o.pay_amount ELSE 0 END) as awaitAmount
+            count(if(o.status = 3,true,null)) as popularizeNum,
+            SUM(CASE WHEN o.status = 3 THEN o.pay_amount ELSE 0 END) as popularizeAmount,
+            count(CASE WHEN o.status in (1,2) THEN true ELSE null END) as awaitNum,
+            SUM(CASE WHEN o.status in (1,2) THEN o.pay_amount ELSE 0 END) as awaitAmount
         FROM
             oms_order o
         WHERE