update:订单数量查询

fengliang
1 parent d665621f
Showing 4 changed files with 39 additions and 7 deletions
etrade-order/src/main/java/com/diligrp/etrade/order/api/OrderQueryBuyerController.java
etrade-order/src/main/java/com/diligrp/etrade/order/domain/OrderDto.java
etrade-order/src/main/java/com/diligrp/etrade/order/domain/OrderStateNumberDto.java
etrade-order/src/main/java/com/diligrp/etrade/order/service/impl/OrderQueryBuyerServiceImpl.java
@@ -69,25 +69,25 @@ public class OrderQueryBuyerController {
             return Message.success(orderStateNumbers);
         }
         for (OrderStateNumberDto item : numberDtoList){
-            if (item.getState().equals(OrderState.WAIT_ENTER.getCodeInteger())){
+            if (item.getCode().equals(OrderState.WAIT_ENTER.getCodeInteger())){
                 orderStateNumbers.setWaitConfirm(item.getNumber());
                 orderStateNumbers.setAll(orderStateNumbers.getAll()+ item.getNumber());
-            } else if (item.getState().equals(OrderState.WAIT_PAY.getCodeInteger())) {
+            } else if (item.getCode().equals(OrderState.WAIT_PAY.getCodeInteger())) {
                 orderStateNumbers.setWaitPay(item.getNumber());
                 orderStateNumbers.setAll(orderStateNumbers.getAll()+ item.getNumber());
-            } else if (item.getState().equals(OrderState.FINISH.getCodeInteger())) {
+            } else if (item.getCode().equals(OrderState.FINISH.getCodeInteger())) {
                 orderStateNumbers.setFinished(item.getNumber());
                 orderStateNumbers.setAll(orderStateNumbers.getAll()+ item.getNumber());
-            } else if (item.getState().equals(OrderState.CANCEL.getCodeInteger())) {
+            } else if (item.getCode().equals(OrderState.CANCEL.getCodeInteger())) {
                 orderStateNumbers.setCancel(item.getNumber());
                 orderStateNumbers.setAll(orderStateNumbers.getAll()+ item.getNumber());
-            }else if(item.getState().equals(OrderState.WAIT_MAPPING.getCodeInteger())){
+            }else if(item.getCode().equals(OrderState.WAIT_MAPPING.getCodeInteger())){
                 orderStateNumbers.setWaitMapping(item.getNumber());
                 orderStateNumbers.setAll(orderStateNumbers.getAll()+ item.getNumber());
-            }else if(item.getState().equals(OrderState.WAIT_SEND.getCodeInteger())){
+            }else if(item.getCode().equals(OrderState.WAIT_SEND.getCodeInteger())){
                 orderStateNumbers.setWaitSend(item.getNumber());
                 orderStateNumbers.setAll(orderStateNumbers.getAll()+ item.getNumber());
-            }else if(item.getState().equals(OrderState.WAIT_GET.getCodeInteger())){
+            }else if(item.getCode().equals(OrderState.WAIT_GET.getCodeInteger())){
                 orderStateNumbers.setWaitReceive(item.getNumber());
                 orderStateNumbers.setAll(orderStateNumbers.getAll()+ item.getNumber());
             }
@@ -226,6 +226,8 @@ public class OrderDto {
      */
     private String payeeSellerame;
+    private String location;
+
     /** 是否允许微信支付 */
     private Boolean weChatEnable;
@@ -725,4 +727,12 @@ public class OrderDto {
     public void setTransportFee(Long transportFee) {
         this.transportFee = transportFee;
     }
+
+    public String getLocation() {
+        return location;
+    }
+
+    public void setLocation(String location) {
+        this.location = location;
+    }
 }
@@ -10,6 +10,8 @@ public class OrderStateNumberDto {
     private Integer number;
+    private Integer code;
+
     public Integer getState() {
         return state;
     }
@@ -41,4 +43,12 @@ public class OrderStateNumberDto {
     public void setAchieveState(Integer achieveState) {
         this.achieveState = achieveState;
     }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public void setCode(Integer code) {
+        this.code = code;
+    }
 }
@@ -55,11 +55,16 @@ public class OrderQueryBuyerServiceImpl implements OrderQueryBuyerService {
     public List<OrderStateNumberDto> queryOrderStateNumberBuyer(OrderQueryBuyerDto orderQueryDto) {
         List<OrderStateNumberDto> numberDtoList = orderBuyerQueryMapper.queryOrderStateNumberBuyer(orderQueryDto);
         Map<Integer,OrderStateNumberDto> map = new HashMap<>();
+        OrderStateNumberDto payDto = new OrderStateNumberDto();
+        payDto.setState(OrderState.PAY_FINISH.getCodeInteger());
+        payDto.setCode(OrderState.PAY_FINISH.getCodeInteger());
+        payDto.setNumber(0);
         if(numberDtoList!=null){
             for(OrderStateNumberDto dto : numberDtoList){
                 if(!Objects.equals(dto.getState(), OrderState.PAY_FINISH.getCodeInteger())){
                     OrderStateNumberDto orderStateNumberDto = map.get(dto.getState());
                     if(orderStateNumberDto == null){
+                        dto.setCode(dto.getState());
                         map.put(dto.getState(),dto);
                     }else{
                         orderStateNumberDto.setNumber(dto.getNumber()+orderStateNumberDto.getNumber());
@@ -67,27 +72,34 @@ public class OrderQueryBuyerServiceImpl implements OrderQueryBuyerService {
                 }else if(OrderVerifyState.BUYER_CREATE.getCodeInteger().equals(dto.getVerifyState())){
                     OrderStateNumberDto orderStateNumberDto = map.get(OrderState.WAIT_MAPPING.getCodeInteger());
                     if(orderStateNumberDto == null){
+                        dto.setCode(OrderState.WAIT_MAPPING.getCodeInteger());
                         map.put(OrderState.WAIT_MAPPING.getCodeInteger(),dto);
                     }else{
                         orderStateNumberDto.setNumber(dto.getNumber()+orderStateNumberDto.getNumber());
                     }
+                    payDto.setNumber(payDto.getNumber()+dto.getNumber());
                 }else if(OrderAchieveState.WAIT_ACHIEVE.getCodeInteger().equals(dto.getAchieveState())){
                     OrderStateNumberDto orderStateNumberDto = map.get(OrderState.WAIT_SEND.getCodeInteger());
                     if(orderStateNumberDto == null){
+                        dto.setCode(OrderState.WAIT_SEND.getCodeInteger());
                         map.put(OrderState.WAIT_SEND.getCodeInteger(),dto);
                     }else{
                         orderStateNumberDto.setNumber(dto.getNumber()+orderStateNumberDto.getNumber());
                     }
+                    payDto.setNumber(payDto.getNumber()+dto.getNumber());
                 }else if(OrderAchieveState.ACHIEVING.getCodeInteger().equals(dto.getAchieveState())){
                     OrderStateNumberDto orderStateNumberDto = map.get(OrderState.WAIT_GET.getCodeInteger());
                     if(orderStateNumberDto == null){
+                        dto.setCode(OrderState.WAIT_GET.getCodeInteger());
                         map.put(OrderState.WAIT_GET.getCodeInteger(),dto);
                     }else{
                         orderStateNumberDto.setNumber(dto.getNumber()+orderStateNumberDto.getNumber());
                     }
+                    payDto.setNumber(payDto.getNumber()+dto.getNumber());
                 }
             }
         }
+        map.put(payDto.getCode(),payDto);
         List<OrderStateNumberDto> list = map.values().stream().toList();
         return list;
     }