Merge branch 'master' into develop

kustomization/overlays/prod/kustomization.yaml

@@ -14,4 +14,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly/oms
-  newTag: 5f7d658c5be784735a6e2b3193535ce0f595c888
+  newTag: 9a95538281e9b62dfe08d1724fa46a9137bc9308

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

@@ -66,8 +66,8 @@ public class UavOrderController extends BaseController {
     @ApiOperation(value = "获取未确认订单有多少")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
     @GetMapping("getCountNewOrder")
-    public ResultBody getCountNewOrder() {
-        return uavOrderService.getCountNewOrder();
+    public ResultBody getCountNewOrder(@RequestParam(required = false) Integer backUserId) {
+        return uavOrderService.getCountNewOrder(backUserId);
     }
 
     @ApiOperation(value = "个人订单列表")

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

@@ -28,7 +28,7 @@ public interface UavOrderService {
      * 查询未确定的商城订单个数
      * @return {@link ResultBody}
      */
-    ResultBody getCountNewOrder();
+    ResultBody getCountNewOrder(Integer backUserId);
 
     ResultBody listByUid(UavOrderQO uavOrderQO, BaseAccountDTO currentAccount);
 

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

@@ -899,9 +899,10 @@ public class UavOrderServiceImpl implements UavOrderService {
      * @return {@link ResultBody}
      */
     @Override
-    public ResultBody getCountNewOrder() {
+    public ResultBody getCountNewOrder(Integer backUserId) {
         UavOrderQO uavOrderQO = new UavOrderQO();
         uavOrderQO.setStatusCode(UavOrderStatus.CONFIRM.getCode());
+        uavOrderQO.setThirdBackUserAccountId(backUserId);
         int count = uavOrderDao.countList(uavOrderQO);
 
         int countPointsMall = pointsOrderDao.countNoSend();