修改备注

src/main/java/com/caimei/modules/order/controller/CmOrderRemarkController.java

@@ -3,19 +3,16 @@ package com.caimei.modules.order.controller;
 
 import com.caimei.modules.order.entity.CmOrderRemark;
 import com.caimei.modules.order.service.CmOrderRemarkService;
-import com.caimei.modules.shiro.entity.CmMallAdminUser;
-import com.caimei.modules.shiro.service.ShiroService;
 import com.caimei.utils.JsonModel;
-import com.caimei.utils.TokenEncryptUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
 
-import javax.servlet.http.HttpServletRequest;
-import java.util.Date;
 import java.util.List;
-import java.util.Map;
 
 /**
  * 订单备注Controller
@@ -26,8 +23,6 @@ public class CmOrderRemarkController {
 
     @Autowired
     private CmOrderRemarkService cmOrderRemarkService;
-    @Autowired
-    private ShiroService shiroService;
 
     @ModelAttribute
     public CmOrderRemark get(@RequestParam(required = false) String id) {
@@ -51,33 +46,4 @@ public class CmOrderRemarkController {
         List<CmOrderRemark> remarksList = cmOrderRemarkService.findList(remark);
         return JsonModel.newInstance().success(remarksList);
     }
-
-
-    /**
-     * 保存备注
-     *
-     * @return
-     */
-    @ResponseBody
-    @RequestMapping(value = "addRemarks", method = RequestMethod.POST)
-    public JsonModel addRemarks(@RequestBody Map<String, String> person, HttpServletRequest httpRequest) {
-        JsonModel jsonModel = JsonModel.newInstance();
-        String token = httpRequest.getHeader("token");
-        String decoded = TokenEncryptUtils.decoded(token);
-        String[] tokens = decoded.split("#,#");
-        //用户信息
-        CmMallAdminUser user = shiroService.findByUserId(Integer.valueOf(tokens[1]));
-        try {
-            //保存备注信息
-            CmOrderRemark remark = new CmOrderRemark();
-            remark.setOrderID(Integer.valueOf(person.get("orderID")));
-            remark.setRemarks(person.get("remarks"));
-            remark.setCreateBy(user.getId());
-            remark.setCreateDate(new Date());
-            cmOrderRemarkService.save(remark);
-            return jsonModel.success();
-        } catch (Exception e) {
-            return jsonModel.error("修改失败");
-        }
-    }
 }

src/main/java/com/caimei/modules/order/entity/CmOrderRemark.java

@@ -8,9 +8,10 @@ public class CmOrderRemark implements Serializable {
     private Integer id;
     private Integer orderID; // 主订单ID
     private Integer shopOrderID;  // 子订单ID
-    private String remarks;	// 备注
-    private Integer createBy;	// 创建者
-    private Date createDate;	// 创建日期
+    private String no;
+    private String remarks;    // 备注
+    private Integer createBy;    // 创建者
+    private Date createDate;    // 创建日期
     private String sysUserName;    //创建账户
 
     public Integer getId() {
@@ -37,6 +38,14 @@ public class CmOrderRemark implements Serializable {
         this.shopOrderID = shopOrderID;
     }
 
+    public String getNo() {
+        return no;
+    }
+
+    public void setNo(String no) {
+        this.no = no;
+    }
+
     public String getRemarks() {
         return remarks;
     }

src/main/java/com/caimei/modules/order/service/CmOrderRemarkService.java

@@ -8,6 +8,4 @@ public interface CmOrderRemarkService {
     CmOrderRemark get(String id);
 
     List<CmOrderRemark> findList(CmOrderRemark remark);
-
-    void save(CmOrderRemark remark);
 }

src/main/java/com/caimei/modules/order/service/impl/CmOrderRemarkServiceImpl.java

@@ -22,13 +22,4 @@ public class CmOrderRemarkServiceImpl implements CmOrderRemarkService {
     public List<CmOrderRemark> findList(CmOrderRemark remark) {
         return cmOrderRemarkDao.findList(remark);
     }
-
-    @Override
-    public void save(CmOrderRemark remark) {
-        if (remark.getId() == null) {
-            cmOrderRemarkDao.insert(remark);
-        } else {
-            cmOrderRemarkDao.update(remark);
-        }
-    }
 }

src/main/resources/mapper/CmOrderRemarkMapper.xml

@@ -5,18 +5,19 @@
 <mapper namespace="com.caimei.modules.order.dao.CmOrderRemarkDao">
     <sql id="cmOrderRemarkColumns">
 		su.id AS "id",
-		a.orderId AS "orderId",
+		su.no AS "no",
+		a.orderId AS "orderID",
 		a.remarks AS "remarks",
-		a.createBy AS "createBy",
+		a.createBy AS "createBy.id",
 		a.createDate AS "createDate",
-		su.accountName AS  "sysUserName"
+		su.name AS  "sysUserName"
 	</sql>
 
     <select id="get" resultType="com.caimei.modules.order.entity.CmOrderRemark">
         SELECT
         <include refid="cmOrderRemarkColumns"/>
         FROM cm_order_remark a
-        LEFT JOIN cm_mall_admin_user su ON su.id = a.createBy
+        LEFT JOIN sys_user su ON su.id = a.createBy
         WHERE a.id = #{id}
         ORDER BY a.createDate
     </select>
@@ -25,7 +26,7 @@
         SELECT
         <include refid="cmOrderRemarkColumns"/>
         FROM cm_order_remark a
-        LEFT JOIN cm_mall_admin_user su ON su.id = a.createBy
+        LEFT JOIN sys_user su ON su.id = a.createBy
         <if test="shopOrderID != null">
             <where>
                 <if test="orderID != null and orderID != ''">