提交修改

api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvTradeOrderLineDao.java

@@ -138,4 +138,8 @@ public interface VvTradeOrderLineDao extends BaseMapper<VvTradeOrderLineEntity>
     List<VvTradeOrderLineEntity> selectVvTradeOrderLineByTrackNumberGroupBySkuId(String trackNumber);
 
     int updateVvTradeOrderLineCommentIdById(Long commentId,@By Long id);
+
+
+
+    List<VvTradeOrderLineEntity> selectVvTradeOrderLineByTrackNumber(String trackNumber);
 }

api-third/src/main/java/com/heyu/api/alibaba/request/mm/enums/OrderStatusEnums.java

@@ -5,7 +5,8 @@ public enum OrderStatusEnums {
 
     wait_pay("wait_pay","待支付"),
     wait_shipping("wait_shipping","待发货"),
-    cancel("cancel","取消"),
+    cancel("cancel","买家取消订单"),
+    close("close","卖家关闭订单"),
     shipping("shipping","已发货"),
     delivered("delivered","已签收"),
     all_refund("all_refund","全部退款"),

api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/AppDeliveredDTO.java

@@ -3,17 +3,14 @@ package com.heyu.api.alibaba.request.mm.order;
 
 import lombok.Data;
 
-import java.util.List;
-
 @Data
 public class AppDeliveredDTO {
 
+
     /***
-     * 子订单号
+     * trackNumber
      */
-    private List<Long> tradeOrderLineIds;
+    private String trackNumber;
-
-
 
 }
 

api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppOrderController.java

@@ -64,6 +64,7 @@ public class AppOrderController {
      * https://api.1024api.com/api-interface/app/order/list
      *
      * 列表
+     * todo quyixiao
      */
     @RequestMapping("/list")
     public R list(@RequestBody AppOrderRequest vvOrderRequest) {
@@ -107,7 +108,6 @@ public class AppOrderController {
         for (VvTradeOrderLineEntity vvTradeOrderLineEntity : vvTradeOrderLineEntities) {
             AppTradeOrderLineResp appTradeOrderLineResp = new AppTradeOrderLineResp();
 
-
             BeanUtils.copyProperties(vvTradeOrderLineEntity, appTradeOrderLineResp);
 
             VvPackageEntity packageDTO = vvPackageEntityMap.get(vvTradeOrderLineEntity.getTrackNumber());
@@ -115,6 +115,7 @@ public class AppOrderController {
             VvTradeOrderEntity vvTradeOrderEntity = vvTradeOrderEntityMap.get(vvTradeOrderLineEntity.getTradeOrderId());
 
             appTradeOrderLineResp.setVvPackageEntity(packageDTO);
+
             appTradeOrderLineResp.setTradeOrderEntity(vvTradeOrderEntity);
 
             vvOrderListResps.add(appTradeOrderLineResp);
@@ -124,7 +125,7 @@ public class AppOrderController {
 
 
     /***
-     * 列表
+     *  订单添加
      */
     @RequestMapping("/add")
     public R add(@RequestBody VvTradeOrderDTO vvOrderRequest) {
@@ -265,12 +266,14 @@ public class AppOrderController {
     }
 
 
+
+
     /***
-     * 订单 妥投
+     * 订单 妥投   /app/order/delivered
      */
     @RequestMapping("/delivered")
     public R topack(@RequestBody AppDeliveredDTO vvDeliveredDTO) {
-        List<VvTradeOrderLineEntity> vvTradeOrderLineEntityList = vvTradeOrderLineDao.selectVvTradeOrderLineByIds(vvDeliveredDTO.getTradeOrderLineIds());
+        List<VvTradeOrderLineEntity> vvTradeOrderLineEntityList = vvTradeOrderLineDao.selectVvTradeOrderLineByTrackNumber(vvDeliveredDTO.getTrackNumber());
         for (VvTradeOrderLineEntity tradeOrderLineEntity : vvTradeOrderLineEntityList) {
             if (!OrderStatusEnums.shipping.getStatus().equals(tradeOrderLineEntity.getStatus())) {
                 return R.error("订单状态不对");

api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppShoppingCartController.java

@@ -95,7 +95,7 @@ public class AppShoppingCartController {
 
 
     /***
-     * 更新 或 添加  ，如数量更新
+     * 更新 或 添加  ，如数量更新            /app/shipping/cart/addOrUpdate
      */
     @RequestMapping("/addOrUpdate")
     public R add(@RequestBody VvShoppingCartAddRequest VvShoppingCartAddRequest) {
@@ -114,8 +114,8 @@ public class AppShoppingCartController {
 
         vvShoppingCartEntity.setProductId(vvSkuEntity.getProductId());
 
-        vvShoppingCartEntity.setSinglePrice(vvSkuEntity.getSalePrice());
+        vvShoppingCartEntity.setSinglePrice(vvSkuEntity.getPromotionPrice());
-        vvShoppingCartEntity.setAllPrice(BigDecimalUtil.multiply(vvSkuEntity.getSalePrice(), new BigDecimal(VvShoppingCartAddRequest.getNum())));
+        vvShoppingCartEntity.setAllPrice(BigDecimalUtil.multiply(vvSkuEntity.getPromotionPrice(), new BigDecimal(VvShoppingCartAddRequest.getNum())));
         List<VvSkuPropertyValueEntity> vvSkuPropertyValueEntities = vvSkuPropertyValueDao.selectVvSkuPropertyValueBySkuId(vvShoppingCartEntity.getSkuId());
 
         VvSkuPropertyValueEntity vvSkuPropertyValue = vvSkuPropertyValueEntities.get(0);