供应商售货清单

src/main/java/com/caimei365/order/controller/ShipApi.java

@@ -88,6 +88,19 @@ public class ShipApi {
         return shipService.getShopOrderDetail(shopOrderId);
     }
 
+    /**
+     * 供应商售货清单
+     */
+    @ApiOperation("供应商售货清单（旧：/supplier/salesList）")
+    @ApiImplicitParam(required = true, name = "shopOrderId", value = "子订单Id")
+    @GetMapping("/sales/list")
+    public ResponseJson<Map<String, Object>> getSalesList(Integer shopOrderId){
+        if (null == shopOrderId) {
+            return ResponseJson.error("参数不能为空！", null);
+        }
+        return shipService.getSalesList(shopOrderId);
+    }
+
     /**
      * 发货页面子订单数据
      */

src/main/java/com/caimei365/order/service/ShipService.java

@@ -45,6 +45,11 @@ public interface ShipService {
      * @param shopOrderId 子订单Id
      */
     ResponseJson<Map<String, Object>> getShopOrderDetail(Integer shopOrderId);
+    /**
+     * 供应商售货清单
+     * @param shopOrderId 子订单Id
+     */
+    ResponseJson<Map<String, Object>> getSalesList(Integer shopOrderId);
     /**
      * 发货页面子订单数据
      * @param shopOrderId 子订单Id

src/main/java/com/caimei365/order/service/impl/ShipServiceImpl.java

@@ -29,6 +29,7 @@ import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
 import java.util.*;
 
 import static com.alibaba.fastjson.JSON.parseArray;
@@ -124,6 +125,31 @@ public class ShipServiceImpl implements ShipService {
         return ResponseJson.success(map);
     }
 
+    /**
+     * 供应商售货清单
+     *
+     * @param shopOrderId 子订单Id
+     */
+    @Override
+    public ResponseJson<Map<String, Object>> getSalesList(Integer shopOrderId) {
+        ShopOrderVo shopOrder = shipMapper.getShopOrder(shopOrderId);
+        // 供应商名称
+        String shopName = baseMapper.getShopNameById(shopOrder.getShopId());
+        shopOrder.setShopName(shopName);
+        // 收货地址
+        OrderUserinfoVo userInfo = addressMapper.getOrderUserinfo(shopOrder.getOrderId());
+        shopOrder.setUserInfo(userInfo);
+        // 订单商品
+        List<OrderProductVo> orderProductList = orderCommonMapper.getShopOrderProduct(shopOrder.getShopOrderId());
+        shopOrder.setOrderProductList(orderProductList);
+
+        Map<String, Object> map = new HashMap<>(2);
+        String currentTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
+        map.put("shopOrder", shopOrder);
+        map.put("currentTime", currentTime);
+        return ResponseJson.success(map);
+    }
+
     /**
      * 发货页面子订单数据
      *

src/main/resources/mapper/ShipMapper.xml

@@ -75,7 +75,6 @@
             a.orderID AS orderId,
             a.orderNo,
             a.shopID AS shopId,
-            a.shopName,
             a.note,
             a.userID AS userId,
             a.clubID AS clubId,
@@ -167,7 +166,6 @@
             orderID AS orderId,
             orderNo,
             shopID AS shopId,
-            shopName,
             note,
             userID AS userId,
             clubID AS clubId,