Merge branch 'develop'

kustomization/overlays/dev/kustomization.yaml

@@ -14,4 +14,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/oms
-  newTag: dfba6777489da5e028d1436989346d127198f628
+  newTag: 2be7492268742626e7bcd66e55fe31e79e3c433d

src/main/java/com/mmc/oms/controller/mall/PointsMallController.java

@@ -90,7 +90,12 @@ public class PointsMallController extends BaseController {
         return pointMallService.updateGoodsOrder(param);
     }
 
-
+    @ApiOperation(value = "每个积分商品已兑换次数")
+    @ApiResponses({ @ApiResponse(code = 200, message = "OK", response = ResultBody.class) })
+    @PostMapping("getCountMall")
+    public ResultBody getCountMall() {
+        return pointMallService.getCountMall();
+    }
 
 
 }

src/main/java/com/mmc/oms/dao/mall/PointsOrderDao.java

@@ -4,6 +4,7 @@ import com.mmc.oms.entity.mall.PointsOrderDO;
 import com.mmc.oms.model.qo.GeneralQO;
 import com.mmc.oms.model.qo.PointsMallOrderQO;
 import com.mmc.oms.model.vo.mall.PointsOrderVO;
+import com.mmc.oms.model.vo.mall.StatisticsBuyGoodsVO;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
@@ -32,4 +33,8 @@ public interface PointsOrderDao {
 
     List<PointsOrderVO> getOrderList(PointsMallOrderQO qo);
     int countOrderList(PointsMallOrderQO qo);
+
+    int countNoSend();
+
+    List<StatisticsBuyGoodsVO> getCountMall();
 }

src/main/java/com/mmc/oms/entity/mall/PointsOrderDO.java

 package com.mmc.oms.entity.mall;
 
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -68,6 +69,9 @@ public class PointsOrderDO implements Serializable {
     @ApiModelProperty(value = "是否发货 1发货 0没")
     private Integer sendStatus;
 
+    @ApiModelProperty(value = "发货人")
+    private String sendUserName;
+
     private static final long serialVersionUID = 1L;
 
 

src/main/java/com/mmc/oms/model/vo/mall/PointsOrderVO.java

@@ -85,5 +85,8 @@ public class PointsOrderVO {
      */
     @ApiModelProperty(value = "商品图片")
     private String goodsUrl;
+
+    @ApiModelProperty(value = "发货人")
+    private String sendUserName;
     private static final long serialVersionUID = 1L;
 }

src/main/java/com/mmc/oms/model/vo/mall/StatisticsBuyGoodsVO.java

+package com.mmc.oms.model.vo.mall;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class StatisticsBuyGoodsVO {
+    @ApiModelProperty(value = "积分商城id")
+    private Integer pointsMallId;
+    @ApiModelProperty(value = "积分商城商品兑换次数")
+    private Integer everyGoodsNum;
+}

src/main/java/com/mmc/oms/service/mall/PointMallService.java

@@ -48,4 +48,10 @@ public interface PointMallService {
     ResultBody getOrderList(PointsMallOrderQO qo);
 
     ResultBody updateGoodsOrder(PointsOrderDO param);
+
+    /**
+     * 统计每个积分商品兑换次数
+     * @return {@link ResultBody}
+     */
+    ResultBody getCountMall();
 }

src/main/java/com/mmc/oms/service/mall/impl/PointsMallServiceImpl.java

@@ -10,6 +10,7 @@ import com.mmc.oms.feign.UserAppApi;
 import com.mmc.oms.model.qo.GeneralQO;
 import com.mmc.oms.model.qo.PointsMallOrderQO;
 import com.mmc.oms.model.vo.mall.PointsOrderVO;
+import com.mmc.oms.model.vo.mall.StatisticsBuyGoodsVO;
 import com.mmc.oms.service.mall.PointMallService;
 import lombok.AllArgsConstructor;
 import lombok.NoArgsConstructor;
@@ -118,4 +119,15 @@ public class PointsMallServiceImpl implements PointMallService {
         }
         return ResultBody.success();
     }
+
+    /**
+     * 统计每个积分商品兑换次数
+     *
+     * @return {@link ResultBody}
+     */
+    @Override
+    public ResultBody getCountMall() {
+        List<StatisticsBuyGoodsVO> countMall = pointsOrderDao.getCountMall();
+        return ResultBody.success(countMall);
+    }
 }

src/main/java/com/mmc/oms/service/uav/impl/UavOrderServiceImpl.java

@@ -11,6 +11,7 @@ import com.mmc.oms.common.result.ResultBody;
 import com.mmc.oms.common.util.CodeUtil;
 import com.mmc.oms.common.util.KdnExpressUtil;
 import com.mmc.oms.dao.UserAddressDao;
+import com.mmc.oms.dao.mall.PointsOrderDao;
 import com.mmc.oms.dao.uav.UavOrderDao;
 import com.mmc.oms.dao.uav.UavOrderExpressDao;
 import com.mmc.oms.dao.uav.UavPODao;
@@ -87,6 +88,9 @@ public class UavOrderServiceImpl implements UavOrderService {
     @Autowired
     private PaymentAppApi paymentAppApi;
 
+    @Autowired
+    private PointsOrderDao pointsOrderDao;
+
     @Override
     @Transactional
     public ResultBody addOrder(AddUavOrderVO param, BaseAccountDTO currentAccount) {
@@ -899,6 +903,11 @@ public class UavOrderServiceImpl implements UavOrderService {
         UavOrderQO uavOrderQO = new UavOrderQO();
         uavOrderQO.setStatusCode(UavOrderStatus.CONFIRM.getCode());
         int count = uavOrderDao.countList(uavOrderQO);
-        return ResultBody.success(count);
+
+        int countPointsMall = pointsOrderDao.countNoSend();
+        List<Integer> list = new ArrayList<>();
+        list.add(count);
+        list.add(countPointsMall);
+        return ResultBody.success(list);
     }
 }

src/main/resources/mapper/PointsOrderDao.xml

@@ -45,7 +45,7 @@
         po.id,
         user_id,points_mall_id,address,
         tracking_number,user_name,user_phone,
-        trackint_company,send_status,need_points,goods,goods_url,po.create_time
+        trackint_company,send_status,need_points,goods,goods_url,po.create_time,send_user_name
         from points_order po
         inner join points_mall pm on po.points_mall_id = pm.id
         where 1=1
@@ -55,6 +55,15 @@
         order by po.create_time desc
         limit #{pageNo},#{pageSize}
     </select>
+    <select id="countNoSend" resultType="java.lang.Integer">
+        select count(1) from points_order
+        where send_status = 0
+    </select>
+    <select id="getCountMall" resultType="com.mmc.oms.model.vo.mall.StatisticsBuyGoodsVO">
+        select points_mall_id,count(id) as every_goods_num
+        from points_order
+        GROUP BY points_mall_id
+    </select>
 
     <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
         delete from points_order
@@ -103,10 +112,7 @@
     <update id="updateByPrimaryKeySelective" parameterType="com.mmc.oms.entity.mall.PointsOrderDO">
         update points_order
         <set>
-
-
                     update_time = NOW(),
-
                 <if test="userId != null">
                     user_id = #{userId,jdbcType=INTEGER},
                 </if>
@@ -131,6 +137,9 @@
                 <if test="sendStatus != null">
                     send_status = #{sendStatus,jdbcType=INTEGER},
                 </if>
+            <if test="sendUserName != null">
+                send_user_name = #{sendUserName}
+            </if>
         </set>
         where   id = #{id,jdbcType=INTEGER} 
     </update>