新增快递修改功能

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

@@ -800,6 +800,8 @@ public class OrderController {
             order.setShippingName(orderEntity.getShippingName());
             order.setShippingCode(orderEntity.getShippingCode());
             order.setShippingNo(orderEntity.getShippingNo());
+            order.setModerSn(ShiroUtils.getUserEntity().getUsername());
+            order.setModTime(new Date());
             orderService.update(order);
         }
         return R.ok();

kmall-admin/src/main/java/com/kmall/admin/entity/OrderEntity.java

@@ -145,6 +145,26 @@ public class OrderEntity implements Serializable {
 
     private String storeName;
 
+    private String moderSn;
+
+    private String createrSn;
+
+    public String getModerSn() {
+        return moderSn;
+    }
+
+    public void setModerSn(String moderSn) {
+        this.moderSn = moderSn;
+    }
+
+    public String getCreaterSn() {
+        return createrSn;
+    }
+
+    public void setCreaterSn(String createrSn) {
+        this.createrSn = createrSn;
+    }
+
     public String getStoreName() {
         return storeName;
     }

kmall-admin/src/main/resources/mybatis/mapper/OrderDao.xml

@@ -62,6 +62,7 @@
         <result property="isMergePay" column="is_merge_pay"/>
         <result property="payTransactionId" column="pay_transaction_id"/>
         <result property="storeName" column="store_name"/>
+        <result property="moderSn" column="moder_sn"/>
     </resultMap>
 
     <select id="queryObject" resultType="com.kmall.admin.entity.OrderEntity">
@@ -475,6 +476,8 @@
             <if test="merchSn != null">`merch_sn` = #{merchSn},</if>
             <if test="createTime != null">`create_time` = #{createTime},</if>
             <if test="modTime != null">`mod_time` = #{modTime},</if>
+            <if test="createrSn != null">`creater_sn` = #{createrSn},</if>
+            <if test="moderSn != null">`moder_sn` = #{moderSn},</if>
         </set>
         where id = #{id}
     </update>

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

@@ -78,6 +78,9 @@
     <Card v-show="showDiv == 8">
         <p slot="title">{{title}}</p>
         <i-form ref="formValidate" :model="order" :rules="ruleValidate" :label-width="100">
+            <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>

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

@@ -149,6 +149,7 @@ $(function () {
                     return value;
                 }
             },
+            {label: '修改人', name: 'moderSn', index: 'moderSn', width: 80},
             {
                 label: '操作', width: 180, sortable: false,
                 formatter: function (value, col, row) {