订单优化

platform-admin/src/main/java/com/platform/controller/TbCfOrderController.java

 package com.platform.controller;
 
-import com.platform.entity.SysUserEntity;
-import com.platform.entity.TbCfItemDetailEntity;
-import com.platform.entity.TbCfOrderEntity;
-import com.platform.entity.TbCfOrderListEntity;
+import com.platform.entity.*;
 import com.platform.service.TbCfItemOrderRService;
 import com.platform.service.TbCfOrderListService;
 import com.platform.service.TbCfOrderService;
@@ -246,6 +243,10 @@ public class TbCfOrderController extends AbstractController {
     public R orderBasic(@PathVariable("orderId") String orderId) {
         //查询列表数据
         OrderBasicVo orderBasicVo = tbCfOrderListService.queryorderBasic(orderId);
+        List<TbCfItemOrderREntity> orderDetails = tbCfOrderService.queryByOrderId(orderId);
+        for (TbCfItemOrderREntity orderDetail : orderDetails) {
+
+        }
         orderBasicVo.setAtcTime("35天（day）");
 //        orderBasicVo.setCountry("赞比亚（Zambia）");
         if (orderBasicVo.getOrderSource() != null)
@@ -360,10 +361,11 @@ public class TbCfOrderController extends AbstractController {
         return R.ok().put("page", pageUtil);
     }
 
-    @PutMapping("/setToTestOrder/{orderId}")
+    @PutMapping("/setToTestOrder")
     @ResponseBody
-    public R setToTestOrder(@PathVariable("orderId") String orderId) {
-        tbCfOrderListService.setToTestOrder(orderId);
+    public R setToTestOrder(@RequestParam("tested") String tested,
+                            @RequestParam("orderId") String orderId) {
+        tbCfOrderListService.setToTestOrder(tested,orderId);
         return R.ok();
     }
 

platform-admin/src/main/java/com/platform/dao/TbCfOrderListDao.java

@@ -3,6 +3,7 @@ package com.platform.dao;
 import com.platform.entity.TbCfOrderListEntity;
 import com.platform.vo.DeliveryOrderVo;
 import com.platform.vo.OrderBasicVo;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -43,5 +44,5 @@ public interface TbCfOrderListDao extends BaseDao<TbCfOrderListEntity> {
 
     int saveOrUpdatemMemoOrder(OrderBasicVo memoOrderVo);
 
-    int setToTestOrder(String orderId);
+    int setToTestOrder(@Param("tested") String tested, @Param("orderId") String orderId);
 }

platform-admin/src/main/java/com/platform/service/TbCfOrderListService.java

@@ -60,5 +60,5 @@ public interface TbCfOrderListService {
 
     Long getOrderNum(String status);
 
-    int setToTestOrder(String orderId);
+    int setToTestOrder(String tested,String orderId);
 }

platform-admin/src/main/java/com/platform/service/TbCfOrderService.java

 package com.platform.service;
 
 import com.platform.entity.TbCfItemDetailEntity;
+import com.platform.entity.TbCfItemOrderREntity;
 import com.platform.entity.TbCfOrderEntity;
 import com.platform.vo.PlatformOrderVo;
 import com.platform.vo.SearchKeywords;
@@ -131,6 +132,7 @@ public interface TbCfOrderService {
 
     int queryCommodityTotal();
 
+    List<TbCfItemOrderREntity> queryByOrderId(String orderId);
 
 
 

platform-admin/src/main/java/com/platform/service/impl/TbCfOrderListServiceImpl.java

@@ -141,8 +141,8 @@ public class TbCfOrderListServiceImpl implements TbCfOrderListService {
     }
 
     @Override
-    public int setToTestOrder(String orderId) {
-        return tbCfOrderListDao.setToTestOrder(orderId);
+    public int setToTestOrder(String tested,String orderId) {
+        return tbCfOrderListDao.setToTestOrder(tested,orderId);
     }
 
 }

platform-admin/src/main/java/com/platform/service/impl/TbCfOrderServiceImpl.java

@@ -258,5 +258,10 @@ public class TbCfOrderServiceImpl implements TbCfOrderService {
         return tbCfOrderDao.queryTotal1() + tbCfOrderDao.queryTotal2();
     }
 
+    @Override
+    public List<TbCfItemOrderREntity> queryByOrderId(String orderId) {
+        return tbCfItemOrderRDao.queryByOrderId(orderId);
+    }
+
 
 }

platform-admin/src/main/java/com/platform/vo/DeliveryOrderVo.java

@@ -23,7 +23,8 @@ public class DeliveryOrderVo implements Serializable {
     private String deliveryPhone;
     private String deliveryAddress;
     private String itemUrl;
-    private String reduceAmount;
+    private BigDecimal reduceAmount;
+    private Integer length;
 
     public String getItemUrl() {
         return itemUrl;
@@ -154,11 +155,19 @@ public class DeliveryOrderVo implements Serializable {
         this.itemSku = itemSku;
     }
 
-    public String getReduceAmount() {
+    public BigDecimal getReduceAmount() {
         return reduceAmount;
     }
 
-    public void setReduceAmount(String reduceAmount) {
+    public void setReduceAmount(BigDecimal reduceAmount) {
         this.reduceAmount = reduceAmount;
     }
+
+    public Integer getLength() {
+        return length;
+    }
+
+    public void setLength(Integer length) {
+        this.length = length;
+    }
 }

platform-admin/src/main/java/com/platform/vo/OrderBasicVo.java

@@ -37,6 +37,8 @@ public class OrderBasicVo implements Serializable {
 
     private BigDecimal reduceAmount;
 
+    private Integer length;
+
     public BigDecimal getCouponPrice() {
         return couponPrice;
     }
@@ -262,4 +264,12 @@ public class OrderBasicVo implements Serializable {
     public void setReduceAmount(BigDecimal reduceAmount) {
         this.reduceAmount = reduceAmount;
     }
+
+    public Integer getLength() {
+        return length;
+    }
+
+    public void setLength(Integer length) {
+        this.length = length;
+    }
 }

platform-admin/src/main/resources/com/platform/dao/TbCfOrderListDao.xml

@@ -46,7 +46,8 @@
         c.coupon_title,
         o.delivery_flag,
         o.reduce_amount,
-        a.email
+        a.email,
+        o.tested
         from tb_cf_order o
         LEFT JOIN tb_cf_finance f on f.order_id=o.order_id
         LEFT JOIN tb_cf_user_info u on u.user_id=o.user_id
@@ -164,7 +165,8 @@
         o.delivery_name,
         o.delivery_phone,
         o.delivery_address,
-        o.reduce_amount
+        o.reduce_amount,
+        o.tested
         FROM
         tb_cf_item_order_r r
         LEFT JOIN tb_cf_order o ON o.order_id = r.order_id
@@ -219,7 +221,8 @@
 		o.update_time,
 		o.order_source,
 		o.coupon_price,
-		o.reduce_amount
+		o.reduce_amount,
+		o.tested
 		from tb_cf_order o
 		LEFT JOIN tb_cf_finance f on f.order_id=o.order_id
 		LEFT JOIN tb_cf_coupon c on c.coupon_id=o.coupon_id
@@ -252,7 +255,7 @@
 	</update>
 
     <update id="setToTestOrder">
-        update tb_cf_order set tested='T' where order_id=#{orderId}
+        update tb_cf_order set tested=#{tested} where order_id=#{orderId}
     </update>
     <select id="getMemoOrder" resultType="com.platform.vo.OrderBasicVo">
 		select