订单管理

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

@@ -3,23 +3,23 @@ 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.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
 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 java.util.ArrayList;
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 /**
  * 订单备注Controller
- *
  */
 @Controller
 @RequestMapping(value = "/order/cmOrderRemark")
@@ -27,6 +27,8 @@ public class CmOrderRemarkController {
 
     @Autowired
     private CmOrderRemarkService cmOrderRemarkService;
+    @Autowired
+    private ShiroService shiroService;
 
     @ModelAttribute
     public CmOrderRemark get(@RequestParam(required = false) String id) {
@@ -62,14 +64,20 @@ public class CmOrderRemarkController {
      */
     @ResponseBody
     @RequestMapping(value = "addRemarks")
-    public JsonModel addRemarks(String remarks, Integer orderID, Integer shopOrderID) {
+    public JsonModel addRemarks(String remarks, Integer orderID, Integer shopOrderID, 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(orderID);
             remark.setShopOrderID(shopOrderID);
             remark.setRemarks(remarks);
+            remark.setCreateBy(user.getId());
             cmOrderRemarkService.save(remark);
             return jsonModel.success();
         } catch (Exception e) {

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

@@ -11,6 +11,7 @@ public class CmOrderRemark implements Serializable {
     private String remarks;	// 备注
     private Integer createBy;	// 创建者
     private Date createDate;	// 创建日期
+    private String sysUserName;    //创建账户
 
     public Integer getId() {
         return id;
@@ -59,4 +60,12 @@ public class CmOrderRemark implements Serializable {
     public void setCreateDate(Date createDate) {
         this.createDate = createDate;
     }
+
+    public String getSysUserName() {
+        return sysUserName;
+    }
+
+    public void setSysUserName(String sysUserName) {
+        this.sysUserName = sysUserName;
+    }
 }

src/main/java/com/caimei/modules/products/controller/CmMallOrganizeProductsController.java

@@ -174,9 +174,10 @@ public class CmMallOrganizeProductsController {
         Map<String, Object> map = new HashMap();
         PageHelper.startPage(page.getIndex(), page.getPageSize());
         List<CmMallOrganizeProducts> listBuyMall = cmMallOrganizeProductsService.findListBuyMall(cmMallOrganizeProducts);
+        Page<CmMallOrganizeProducts> productsPage = new Page<>(listBuyMall);
         //获取商品分类列表
         List<CmMallProductsClassify> listByEffective = cmMallProductsClassifyService.findListByEffective(cmMallOrganizeProducts.getOrganizeID());
-        map.put("listBuyMall", listBuyMall);
+        map.put("productsPage", productsPage);
         map.put("listByEffective", listByEffective);
         return JsonModel.newInstance().success(map);
     }

src/main/java/com/caimei/modules/shiro/controller/ShiroController.java

@@ -41,6 +41,12 @@ public class ShiroController {
         }
     }
 
+    /**
+     * 返回用户信息
+     *
+     * @param token
+     * @return
+     */
     @GetMapping("/info")
     public JsonModel info(String token) {
         String decoded = TokenEncryptUtils.decoded(token);

src/main/resources/mapper/CmOrderRemarkMapper.xml

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