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: 8556b74aa8ed48d880b5cbd7e803132aff549437
+  newTag: dcb9f24223e96135b2e9a18b461fb2731c6c6eef

src/main/java/com/mmc/oms/controller/uav/UavOrderController.java

@@ -8,10 +8,7 @@ import com.mmc.oms.model.dto.uav.*;
 import com.mmc.oms.model.qo.uav.UavOrderQO;
 import com.mmc.oms.model.vo.uav.*;
 import com.mmc.oms.service.uav.UavOrderService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
+import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -66,6 +63,13 @@ public class UavOrderController extends BaseController {
         return uavOrderService.list(uavOrderQO, this.getCurrentAccount(request));
     }
 
+    @ApiOperation(value = "获取未确认订单有多少")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+    @GetMapping("getCountNewOrder")
+    public ResultBody getCountNewOrder() {
+        return uavOrderService.getCountNewOrder();
+    }
+
     @ApiOperation(value = "个人订单列表")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = UavOrderDTO.class)})
     @PostMapping("listByUid")

src/main/java/com/mmc/oms/filter/AuthSignatureFilter.java

@@ -41,7 +41,7 @@ public class AuthSignatureFilter implements AuthFilter {
      */
     private static final String[] IGNORE_URLS = {"/oms/swagger-resources", "/oms/v2/api-docs", "/oms/doc.html",
             "/oms/mallorder/listStatus","/oms/actuator/health/readiness", "/oms/uav-order/finishSign", "/oms/uav-order/statusList",
-            "/oms/uav-order/listGoodsRemark"
+            "/oms/uav-order/listGoodsRemark", "/oms/uav-order/getCountNewOrder"
     };
 
     /*无需加密狗无需登录白名单*/

src/main/java/com/mmc/oms/service/uav/UavOrderService.java

@@ -24,6 +24,12 @@ public interface UavOrderService {
 
     ResultBody list(UavOrderQO uavOrderQO, BaseAccountDTO currentAccount);
 
+    /**
+     * 查询未确定的商城订单个数
+     * @return {@link ResultBody}
+     */
+    ResultBody getCountNewOrder();
+
     ResultBody listByUid(UavOrderQO uavOrderQO, BaseAccountDTO currentAccount);
 
     ResultBody pay(Integer id, BaseAccountDTO currentAccount, HttpServletRequest request);
@@ -58,4 +64,7 @@ public interface UavOrderService {
     ResultBody deductWallet(BigDecimal allShareAmount, BigDecimal allSalaryAmount, BaseAccountDTO currentAccount);
 
     List<UavOrderRemarkDTO> listGoodsRemark(Integer remarkType, Integer goodsId);
+
+
+
 }

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

@@ -888,4 +888,17 @@ public class UavOrderServiceImpl implements UavOrderService {
         return CollectionUtils.isNotEmpty(remarkDOS) ? remarkDOS.stream()
                 .map(UavOrderRemarkDO::buildUavOrderRemarkDTO).collect(Collectors.toList()) : null;
     }
+
+    /**
+     * 查询未确定的商城订单个数
+     *
+     * @return {@link ResultBody}
+     */
+    @Override
+    public ResultBody getCountNewOrder() {
+        UavOrderQO uavOrderQO = new UavOrderQO();
+        uavOrderQO.setStatusCode(UavOrderStatus.CONFIRM.getCode());
+        int count = uavOrderDao.countList(uavOrderQO);
+        return ResultBody.success(count);
+    }
 }