订单交易

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/order/GicOrderController.java

@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
+import com.gic.business.order.qdto.ordermanage.CountOrderStatusQDTO;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
@@ -128,7 +129,11 @@ public class GicOrderController {
     public RestResponse<Object> orderCount(String enterpriseId, String storeId, String clerkId, String search,
             @RequestParam(defaultValue = "1") int status) {
         OrderCountVO vo = new OrderCountVO();
-        this.webOrderManageApiService.countOrderStatus(enterpriseId, 1);
+        CountOrderStatusQDTO countOrderStatusQDTO = new CountOrderStatusQDTO();
+        countOrderStatusQDTO.setEnterpriseId(enterpriseId);
+        countOrderStatusQDTO.setBusinessType(1);
+        countOrderStatusQDTO.setStoreId(storeId);
+        this.webOrderManageApiService.countOrderStatus(countOrderStatusQDTO);
         return RestResponse.successResult(vo);
     }
 
@@ -136,10 +141,10 @@ public class GicOrderController {
     @RequestMapping("order-detail")
     public RestResponse<Object> orderDetail(String enterpriseId, String clerkId, String searchParams,
             @RequestParam(defaultValue = "1") int orderType, String orderId) {
-        QueryOrderDetailQDTO qdto = new QueryOrderDetailQDTO();
-        qdto.setEnterpriseId(enterpriseId);
-        qdto.setOrderId(orderId);
-        ServiceResponse<OrderDetailDTO> ret = webOrderManageApiService.getOrderDetail(qdto);
+        QueryOrderDetailQDTO queryOrderDetailQDTO = new QueryOrderDetailQDTO();
+        queryOrderDetailQDTO.setOrderId(orderId);
+        queryOrderDetailQDTO.setEnterpriseId(enterpriseId);
+        ServiceResponse<OrderDetailDTO> ret = webOrderManageApiService.getOrderDetail(queryOrderDetailQDTO);
         if (!ret.isSuccess()) {
             return RestResponse.failure(ret.getCode(), ret.getMessage());
         }
@@ -157,9 +162,9 @@ public class GicOrderController {
         member.setAddressPhone(orderInfo.getBuyerPhone());
         member.setAddressName(orderInfo.getBuyerName());
         member.setAddressDetail(orderInfo.getAddressInfo());
-        
-        
-        
+
+
+
         orderDetailVO.setMember(member);
         return RestResponse.successResult(orderDetailVO);
     }