更新

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/shop/IShopOrderService.java

@@ -30,6 +30,7 @@ public interface IShopOrderService {
             @HttpParam(name = "accountId", type = HttpParamType.COMMON, description = "账户表id") Long accountId,
             @HttpParam(name = "orderId", type = HttpParamType.COMMON, description = "当当订单号") String orderId,
             @HttpParam(name = "dangOrder", type = HttpParamType.COMMON, description = "夫子订单号") String dangOrder,
+            @HttpParam(name = "dangOrderStatus", type = HttpParamType.COMMON, description = "当当发货状态") String dangOrderStatus,
             @HttpParam(name = "address", type = HttpParamType.COMMON, description = "详细地址") String address,
             @HttpParam(name = "provName", type = HttpParamType.COMMON, description = "省") String provName,
             @HttpParam(name = "cityName", type = HttpParamType.COMMON, description = "市") String cityName,

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/shop/impl/ShopOrderServiceImpl.java

@@ -90,7 +90,7 @@ public class ShopOrderServiceImpl implements IShopOrderService {
     }
 
     @Override
-    public Page<ShopOrder> list(Long accountId, String orderId, String dangOrder, String address, String provName, String cityName, String areaName, String orderStatus, String orderStatusName, String payStatus, String payName, String receiverName, String mobile, String receiver, Integer deleteFlag, Date gmtCreate, Date gmtUpdate, Long userId, Long adminId,String shopName, Integer page, Integer limit) throws ServiceException {
+    public Page<ShopOrder> list(Long accountId, String orderId, String dangOrder,String dangOrderStatus, String address, String provName, String cityName, String areaName, String orderStatus, String orderStatusName, String payStatus, String payName, String receiverName, String mobile, String receiver, Integer deleteFlag, Date gmtCreate, Date gmtUpdate, Long userId, Long adminId,String shopName, Integer page, Integer limit) throws ServiceException {
         Wrapper<ShopOrder> wrapper = new EntityWrapper<ShopOrder>();
         List<Long> param = new ArrayList<>();
         if(!StringUtils.isEmpty(shopName)){
@@ -157,6 +157,9 @@ public class ShopOrderServiceImpl implements IShopOrderService {
         if (!StringUtils.isEmpty(adminId)) {
             wrapper.eq("admin_id", adminId);
         }
+        if (!StringUtils.isEmpty(dangOrderStatus)) {
+            wrapper.like("dang_order_status", dangOrderStatus);
+        }
         wrapper.eq("delete_flag", 0);
         wrapper.orderBy("gmt_update",false);
         List<ShopOrder> list = shopOrderMapper.selectPage(new RowBounds((page - 1) * limit, limit), wrapper);

unimall-admin/src/views/shop/order/index.vue

@@ -33,7 +33,16 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="收件人" prop="receiverName">
+      <el-form-item label="当当发货状态" label-width="100px" prop="receiverName">
+        <el-input
+          v-model="queryParams.dangOrderStatus"
+          placeholder="请输入当当发货状态"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <!-- <el-form-item label="收件人" prop="receiverName">
         <el-input
           v-model="queryParams.receiverName"
           placeholder="请输入收件人"
@@ -41,7 +50,7 @@
           size="small"
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item>
         <el-button
           type="primary"