订单

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

 package com.gic.haoban.manage.web.controller.order;
 
-import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.http.util.EntityUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -12,14 +11,12 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import com.gic.api.base.commons.BasePageInfo;
 import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.business.order.dto.ordermanage.ListOrderDTO;
 import com.gic.business.order.dto.ordermanage.ListOrderItemDTO;
 import com.gic.business.order.dto.ordermanage.OrderDetailDTO;
-import com.gic.business.order.enums.ActivityPreferentialTypeEnum;
 import com.gic.business.order.enums.OrderEnum;
 import com.gic.business.order.qdto.ordermanage.ListOrderManageQDTO;
 import com.gic.business.order.qdto.ordermanage.OrderItemShipmentQDTO;
@@ -30,6 +27,8 @@ import com.gic.commons.util.EntityUtil;
 import com.gic.commons.util.PageHelperUtils;
 import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.haoban.manage.web.controller.marketing.MemberMarketingController;
+import com.gic.haoban.manage.web.vo.order.OrderCountVO;
+import com.gic.haoban.manage.web.vo.order.OrderDetailItemVO;
 import com.gic.haoban.manage.web.vo.order.OrderDetailVO;
 import com.gic.haoban.manage.web.vo.order.OrderListItemVO;
 import com.gic.haoban.manage.web.vo.order.OrderListVO;
@@ -46,10 +45,10 @@ public class GicOrderController {
     // 发货订单列表 (待发货2+待收货3)
     @RequestMapping("list-order")
     public RestResponse<Object> orderList(String enterpriseId, String storeId, String clerkId, String search,
-            @RequestParam(defaultValue = "2") int orderStatus, BasePageInfo pageInfo) {
+            @RequestParam(defaultValue = "1") int status, BasePageInfo pageInfo) {
         // 查询门店
         ListOrderManageQDTO qdto = new ListOrderManageQDTO();
-        qdto.setOrderStep(orderStatus);
+        qdto.setOrderStep(status);
         qdto.setBusinessType(OrderEnum.BusinessTypeEnum.MICRO_MALL.getType());
         qdto.setSearchOrderParam(search);
         // 配送方式 -1：所有 0：门店自提 1：快递发货
@@ -78,11 +77,12 @@ public class GicOrderController {
     }
 
     // 数量查询(待发货+待收货)
-    // orderType:1待发货 2待收货
+    // orderType:2待发货 3待收货
+    @RequestMapping("order-deliver-count")
     public RestResponse<Object> orderCount(String enterpriseId, String clerkId, String searchParams,
             @RequestParam(defaultValue = "1") int orderType) {
-        int count = 0;
-        return RestResponse.successResult(count);
+        OrderCountVO vo = new OrderCountVO();
+        return RestResponse.successResult(vo);
     }
 
     // 订单详情 (客户信息+收货地址+商品详情+订单信息 + 订单状态)
@@ -94,31 +94,11 @@ public class GicOrderController {
             return RestResponse.failure(ret.getCode(), ret.getMessage());
         }
         logger.info("订单信息={}", JSON.toJSONString(ret, true));
-        OrderDetailVO orderDetailVO = EntityUtil.changeEntityByJSON(OrderDetailVO.class, ret.getResult());
-        String discountAmountInfo = "{}";
-        JSONObject jsonObject = JSONObject.parseObject(discountAmountInfo);
-        // 单品
-        BigDecimal discountActivity = jsonObject
-                .getBigDecimal(ActivityPreferentialTypeEnum.ActivityEnum.DISCOUNT_ACTIVITY.getType().toString());
-        discountActivity = (discountActivity != null ? discountActivity : BigDecimal.ZERO);
-        // 等级
-        BigDecimal memberGrade = jsonObject
-                .getBigDecimal(ActivityPreferentialTypeEnum.ActivityEnum.MEMBER_GRADE.getType().toString());
-        memberGrade = (memberGrade != null ? memberGrade : BigDecimal.ZERO);
-        // 满减
-        BigDecimal fullReduce = jsonObject
-                .getBigDecimal(ActivityPreferentialTypeEnum.ActivityEnum.FULL_REDUCTION.getType().toString());
-        fullReduce = (fullReduce != null ? fullReduce : BigDecimal.ZERO);
-
-        // 抵金券
-        BigDecimal cashCoupon = jsonObject
-                .getBigDecimal(ActivityPreferentialTypeEnum.ActivityEnum.CASH_COUPON.getType().toString());
-        cashCoupon = (cashCoupon != null ? cashCoupon : BigDecimal.ZERO);
-
-        // 折扣券
-        BigDecimal discountCoupons = jsonObject
-                .getBigDecimal(ActivityPreferentialTypeEnum.ActivityEnum.DISCOUNT_COUPONS.getType().toString());
-        discountCoupons = (discountCoupons != null ? discountCoupons : BigDecimal.ZERO);
+        OrderDetailVO orderDetailVO = EntityUtil.changeEntityByJSON(OrderDetailVO.class,
+                ret.getResult().getOrderInfo());
+        List<OrderDetailItemVO> orderItemList = EntityUtil.changeEntityListNew(OrderDetailItemVO.class,
+                ret.getResult().getOrderItemList());
+        orderDetailVO.setOrderItemList(orderItemList);
         return RestResponse.successResult(orderDetailVO);
     }
 
@@ -126,8 +106,15 @@ public class GicOrderController {
     @RequestMapping("order-deliver-list")
     public RestResponse<Object> orderDeliverList(String enterpriseId, String orderId) {
         ServiceResponse<OrderDetailDTO> resp = this.webOrderManageApiService.getOrderDetail(enterpriseId, orderId);
-        List<OrderListItemVO> list = null;
-        return RestResponse.successResult(list);
+        List<ListOrderItemDTO> list = resp.getResult().getOrderItemList();
+        List<OrderListItemVO> voList = new ArrayList<>();
+        for (ListOrderItemDTO item : list) {
+            if (StringUtils.isEmpty(item.getLogisticsId())) {
+                OrderListItemVO vo = EntityUtil.changeEntityNew(OrderListItemVO.class, item);
+                voList.add(vo);
+            }
+        }
+        return RestResponse.successResult(voList);
     }
 
     // 发货
@@ -177,5 +164,4 @@ public class GicOrderController {
         this.webOrderManageApiService.updateOrderLogistics(qdto);
         return RestResponse.successResult();
     }
-    // 客户详情中的商城订单
 }

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/order/OrderListItemVO.java

@@ -55,7 +55,16 @@ public class OrderListItemVO implements Serializable {
      */
     private Double payAmount;
     
-   
+    // 库存
+    private int stock ;
+    
+    public int getStock() {
+        return stock;
+    }
+
+    public void setStock(int stock) {
+        this.stock = stock;
+    }
 
     public String getOrderItemId() {
         return orderItemId;