修改管理后台修改订单快递信息逻辑

kmall-admin/src/main/java/com/kmall/admin/controller/OrderController.java

@@ -65,6 +65,8 @@ public class OrderController {
     private PinganResponseService pinganResponseService;
     @Autowired
     private ExcelUtil excelUtil;
+    @Autowired
+    private ShippingService shippingService;
 
     /**
      * 列表
@@ -759,8 +761,15 @@ public class OrderController {
             if(orderInfo.getShippingStatus() == Integer.parseInt(Dict.shippingStatus.item_1.getItem())) {
                 OrderEntity order = new OrderEntity();
                 order.setId(orderInfo.getId());
-                order.setShippingName(orderEntity.getShippingName());
                 order.setShippingCode(orderEntity.getShippingCode());
+                Map map = new HashMap();
+                map.put("code", orderEntity.getShippingCode());
+                ShippingEntity shippingEntity = shippingService.queryObjectByCode(orderEntity.getShippingCode());
+                if(shippingEntity != null) {
+                    order.setShippingName(shippingEntity.getName());
+                }else{
+                    throw new RRException("此订单修改的快递公司信息不存在！不能操作");
+                }
                 order.setShippingNo(orderEntity.getShippingNo());
                 order.setModerSn(ShiroUtils.getUserEntity().getUsername());
                 order.setModTime(new Date());

kmall-admin/src/main/java/com/kmall/admin/service/ShippingService.java

@@ -22,6 +22,8 @@ public interface ShippingService {
      */
     ShippingEntity queryObject(Integer id);
 
+    ShippingEntity queryObjectByCode(String code);
+
     /**
      * 分页查询
      *

kmall-admin/src/main/java/com/kmall/admin/service/impl/ShippingServiceImpl.java

@@ -27,6 +27,11 @@ public class ShippingServiceImpl implements ShippingService {
     }
 
     @Override
+    public ShippingEntity queryObjectByCode(String code) {
+        return shippingDao.queryObjectByCode(code);
+    }
+
+    @Override
     public List<ShippingEntity> queryList(Map<String, Object> map) {
         return shippingDao.queryList(map);
     }

kmall-admin/src/main/webapp/WEB-INF/page/shop/order.html

@@ -117,11 +117,11 @@
             <Form-item label="订单号" prop="orderSn">
                 <i-input v-model="order.orderSn" placeholder="订单号" readonly="readonly"/>
             </Form-item>
-            <Form-item label="快递公司名称" prop="shippingName">
-                <i-input v-model="order.shippingName" placeholder="快递公司"/>
-            </Form-item>
-            <Form-item label="快递简写" prop="shippingCode">
-                <i-input v-model="order.shippingCode" placeholder="快递简写"/>
+            <Form-item label="快递公司" prop="shippingCode">
+                <i-select v-model="order.shippingCode" placeholder="快递公司" filterable label-in-value>
+                    <i-option v-for="shipping in shippingList" :value="shipping.code"
+                              :key="shipping.code">{{shipping.name}}</i-option>
+                </i-select>
             </Form-item>
             <Form-item label="配送单号" prop="shippingNo">
                 <i-input v-model="order.shippingNo" placeholder="快递单号"/>

kmall-admin/src/main/webapp/js/shop/order.js

@@ -249,11 +249,17 @@ let vm = new Vue({
         orderBizTypeList:[],
         thirdMerchantBizList:[],
         supplierThirdMerchantBizList:[],
+        shippingList: []
     },
     methods: {
         query: function () {
             vm.reload(1);
         },
+        getShipping: function () {
+            $.get("../shipping/queryAll", function (r) {
+                vm.shippingList = r.list;
+            });
+        },
         getMacro: function () {
             $.get("../sys/macro/queryMacrosByValue?value=goodsBizType", function (r) {
                 vm.macros = r.list;
@@ -297,6 +303,7 @@ let vm = new Vue({
                     vm.order = r.order;
                     vm.showDiv = 8;
                     vm.title = "修改快递信息";
+                    vm.getShipping();
                 }
             });
         },