首页数据

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

@@ -20,8 +20,8 @@ public class HomePageController {
      * 收款金额统计
      */
     @RequestMapping("receivable")
-    public JsonModel receivableAmount(String endTime, String startTime) {
-        Map<String, Object> map = homePageService.receivableAmount(endTime, startTime);
+    public JsonModel receivableAmount(String endTime, String startTime, Integer organizeID) {
+        Map<String, Object> map = homePageService.receivableAmount(endTime, startTime, organizeID);
         return JsonModel.newInstance().success(map);
     }
 
@@ -29,8 +29,8 @@ public class HomePageController {
      * 订单总量统计
      */
     @RequestMapping("order")
-    public JsonModel orderQuantity(String endTime, String startTime) {
-        Map<String, Object> map = homePageService.orderQuantity(endTime, startTime);
+    public JsonModel orderQuantity(String endTime, String startTime, Integer organizeID) {
+        Map<String, Object> map = homePageService.orderQuantity(endTime, startTime, organizeID);
         return JsonModel.newInstance().success(map);
     }
 
@@ -38,8 +38,8 @@ public class HomePageController {
      * 销售额趋势数据
      */
     @RequestMapping("sale")
-    public JsonModel sale() {
-        Map<String, Object> map = homePageService.sale();
+    public JsonModel sale(Integer organizeID) {
+        Map<String, Object> map = homePageService.sale(organizeID);
         return JsonModel.newInstance().success(map);
     }
 
@@ -47,8 +47,8 @@ public class HomePageController {
      * 热销商品统计
      */
     @RequestMapping("commodity")
-    public JsonModel commodity(String endTime, String startTime) {
-        List<NewOrderProduct> orderProduct = homePageService.commodity(endTime, startTime);
+    public JsonModel commodity(String endTime, String startTime, Integer organizeID) {
+        List<NewOrderProduct> orderProduct = homePageService.commodity(endTime, startTime, organizeID);
         return JsonModel.newInstance().success(orderProduct);
     }
 }

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

@@ -95,8 +95,8 @@ public class ShiroController {
     /**
      * 修改组织信息
      */
-    @RequestMapping("update")
-    public JsonModel updateOrganizeInfo(CmMallOrganize mallOrganize) {
+    @RequestMapping(value = "update", method = RequestMethod.POST)
+    public JsonModel updateOrganizeInfo(@RequestBody CmMallOrganize mallOrganize) {
         shiroService.updateOrganizeInfo(mallOrganize);
         return JsonModel.newInstance().success();
     }

src/main/java/com/caimei/modules/shiro/dao/HomePageDao.java

@@ -9,13 +9,13 @@ import java.util.List;
 @Mapper
 public interface HomePageDao {
 
-    Long findTotalFee(@Param("endTime") String endTime, @Param("startTime") String startTime);
+    Long findTotalFee(@Param("endTime") String endTime, @Param("startTime") String startTime, @Param("organizeID") Integer organizeID);
 
-    Long findBalance(@Param("endTime") String endTime, @Param("startTime") String startTime);
+    Long findBalance(@Param("endTime") String endTime, @Param("startTime") String startTime, @Param("organizeID") Integer organizeID);
 
-    Long findAssociate(@Param("endTime") String endTime, @Param("startTime") String startTime);
+    Long findAssociate(@Param("endTime") String endTime, @Param("startTime") String startTime, @Param("organizeID") Integer organizeID);
 
-    Integer orderQuantity(@Param("endTime") String endTime, @Param("startTime") String startTime, @Param("receiptStatus") String receiptStatus);
+    Integer orderQuantity(@Param("endTime") String endTime, @Param("startTime") String startTime, @Param("receiptStatus") String receiptStatus, @Param("organizeID") Integer organizeID);
 
-    List<NewOrderProduct> commodity(@Param("endTime") String endTime, @Param("startTime") String startTime);
+    List<NewOrderProduct> commodity(@Param("endTime") String endTime, @Param("startTime") String startTime, @Param("organizeID") Integer organizeID);
 }

src/main/java/com/caimei/modules/shiro/service/HomePageService.java

@@ -6,11 +6,11 @@ import java.util.List;
 import java.util.Map;
 
 public interface HomePageService {
-    Map<String, Object> receivableAmount(String endTime, String startTime);
+    Map<String, Object> receivableAmount(String endTime, String startTime, Integer organizeID);
 
-    Map<String, Object> orderQuantity(String endTime, String startTime);
+    Map<String, Object> orderQuantity(String endTime, String startTime, Integer organizeID);
 
-    Map<String, Object> sale();
+    Map<String, Object> sale(Integer organizeID);
 
-    List<NewOrderProduct> commodity(String endTime, String startTime);
+    List<NewOrderProduct> commodity(String endTime, String startTime, Integer organizeID);
 }

src/main/java/com/caimei/modules/shiro/service/impl/HomePageServiceImpl.java

@@ -3,7 +3,9 @@ package com.caimei.modules.shiro.service.impl;
 import com.caimei.modules.order.entity.NewOrderProduct;
 import com.caimei.modules.shiro.dao.HomePageDao;
 import com.caimei.modules.shiro.service.HomePageService;
+import com.caimei.utils.AppUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.text.DecimalFormat;
@@ -14,16 +16,18 @@ import java.util.*;
 public class HomePageServiceImpl implements HomePageService {
     @Autowired
     private HomePageDao homePageDao;
+    @Value("${malladmin.domain}")
+    private String domain;
 
     @Override
-    public Map<String, Object> receivableAmount(String endTime, String startTime) {
+    public Map<String, Object> receivableAmount(String endTime, String startTime, Integer organizeID) {
         Map<String, Object> map = new HashMap();
         //订单总额
-        Long payTotalFee = homePageDao.findTotalFee(endTime, startTime);
+        Long payTotalFee = homePageDao.findTotalFee(endTime, startTime, organizeID);
         //余额支付总金额
-        Long balancePayFee = homePageDao.findBalance(endTime, startTime);
+        Long balancePayFee = homePageDao.findBalance(endTime, startTime, organizeID);
         //已收总金额
-        Long associateAmount = homePageDao.findAssociate(endTime, startTime);
+        Long associateAmount = homePageDao.findAssociate(endTime, startTime, organizeID);
         Long amountReceived = balancePayFee + associateAmount;
         //未收金额
         long uncollected = payTotalFee - amountReceived;
@@ -34,17 +38,17 @@ public class HomePageServiceImpl implements HomePageService {
     }
 
     @Override
-    public Map<String, Object> orderQuantity(String endTime, String startTime) {
+    public Map<String, Object> orderQuantity(String endTime, String startTime, Integer organizeID) {
         Map<String, Object> map = new HashMap();
         DecimalFormat df = new DecimalFormat("0%");
         //订单总数量
-        Integer count = homePageDao.orderQuantity(endTime, startTime, "");
+        Integer count = homePageDao.orderQuantity(endTime, startTime, "", organizeID);
         //已收款数量
-        Integer received = homePageDao.orderQuantity(endTime, startTime, "3");
+        Integer received = homePageDao.orderQuantity(endTime, startTime, "3", organizeID);
         //部分收款数量
-        Integer portion = homePageDao.orderQuantity(endTime, startTime, "2");
+        Integer portion = homePageDao.orderQuantity(endTime, startTime, "2", organizeID);
         //未收数量
-        Integer uncollected = homePageDao.orderQuantity(endTime, startTime, "1");
+        Integer uncollected = homePageDao.orderQuantity(endTime, startTime, "1", organizeID);
         map.put("count", count);
         map.put("received", received);
         map.put("portion", portion);
@@ -53,37 +57,37 @@ public class HomePageServiceImpl implements HomePageService {
     }
 
     @Override
-    public Map<String, Object> sale() {
+    public Map<String, Object> sale(Integer organizeID) {
         Map<String, Object> map = new HashMap();
         List<String> list1 = new ArrayList();
         List<Long> list2 = new ArrayList();
         Map<String, String> map6 = CalendarUtils(-5);
-        Long totalFee6 = homePageDao.findTotalFee(map6.get("endTime"), map6.get("startTime"));
+        Long totalFee6 = homePageDao.findTotalFee(map6.get("endTime"), map6.get("startTime"), organizeID);
         list1.add(map6.get("month"));
         list2.add(totalFee6);
 
         Map<String, String> map5 = CalendarUtils(-4);
-        Long totalFee5 = homePageDao.findTotalFee(map5.get("endTime"), map5.get("startTime"));
+        Long totalFee5 = homePageDao.findTotalFee(map5.get("endTime"), map5.get("startTime"), organizeID);
         list1.add(map5.get("month"));
         list2.add(totalFee5);
 
         Map<String, String> map4 = CalendarUtils(-3);
-        Long totalFee4 = homePageDao.findTotalFee(map4.get("endTime"), map4.get("startTime"));
+        Long totalFee4 = homePageDao.findTotalFee(map4.get("endTime"), map4.get("startTime"), organizeID);
         list1.add(map4.get("month"));
         list2.add(totalFee4);
 
         Map<String, String> map3 = CalendarUtils(-2);
-        Long totalFee3 = homePageDao.findTotalFee(map3.get("endTime"), map3.get("startTime"));
+        Long totalFee3 = homePageDao.findTotalFee(map3.get("endTime"), map3.get("startTime"), organizeID);
         list1.add(map3.get("month"));
         list2.add(totalFee3);
 
         Map<String, String> map2 = CalendarUtils(-1);
-        Long totalFee2 = homePageDao.findTotalFee(map2.get("endTime"), map2.get("startTime"));
+        Long totalFee2 = homePageDao.findTotalFee(map2.get("endTime"), map2.get("startTime"), organizeID);
         list1.add(map2.get("month"));
         list2.add(totalFee2);
 
         Map<String, String> map1 = CalendarUtils(0);
-        Long totalFee1 = homePageDao.findTotalFee(map1.get("endTime"), map1.get("startTime"));
+        Long totalFee1 = homePageDao.findTotalFee(map1.get("endTime"), map1.get("startTime"), organizeID);
         list1.add(map1.get("month"));
         list2.add(totalFee1);
 
@@ -93,8 +97,12 @@ public class HomePageServiceImpl implements HomePageService {
     }
 
     @Override
-    public List<NewOrderProduct> commodity(String endTime, String startTime) {
-        return homePageDao.commodity(endTime, startTime);
+    public List<NewOrderProduct> commodity(String endTime, String startTime, Integer organizeID) {
+        List<NewOrderProduct> commodity = homePageDao.commodity(endTime, startTime, organizeID);
+        for (NewOrderProduct orderProduct : commodity) {
+            orderProduct.setProductImage(AppUtils.getProductImageURL(orderProduct.getProductImage(), 0, domain));
+        }
+        return commodity;
     }
 
     public Map<String, String> CalendarUtils(Integer money) {

src/main/resources/mapper/HomePageMapper.xml

@@ -10,7 +10,7 @@
           cm_order
         WHERE
           status NOT IN (0, 6, 7)
-          AND organizeID = 1
+          AND organizeID = #{organizeID}
           AND delFlag='0'
         <if test="startTime != null and startTime != ''">
             AND orderTime <![CDATA[ >= ]]> #{startTime}
@@ -27,7 +27,7 @@
           cm_order
         WHERE
           status NOT IN (0, 6, 7)
-          AND organizeID = 1
+          AND organizeID = #{organizeID}
           AND delFlag='0'
         <if test="startTime != null and startTime != ''">
             AND orderTime <![CDATA[ >= ]]> #{startTime}
@@ -45,7 +45,7 @@
           LEFT JOIN cm_order co ON cror.orderID = co.orderID
         WHERE
           co.status NOT IN (0, 6, 7)
-          AND co.organizeID = 1
+          AND co.organizeID = #{organizeID}
           AND cror.relationType = '2'
           AND cror.delFlag = '0'
         <if test="startTime != null and startTime != ''">
@@ -63,7 +63,7 @@
           cm_order
         WHERE
           STATUS NOT IN (0, 6, 7)
-          AND organizeID = 1
+          AND organizeID = #{organizeID}
           AND delFlag = '0'
         <if test="startTime != null and startTime != ''">
             AND co.orderTime <![CDATA[ >= ]]> #{startTime}
@@ -86,7 +86,7 @@
           LEFT JOIN cm_order co ON co.orderID = cop.orderID
         WHERE
           co.status NOT IN (0, 6, 7)
-          AND co.organizeID = 1
+          AND co.organizeID = #{organizeID}
           AND co.delFlag = '0'
         <if test="startTime != null and startTime != ''">
             AND co.orderTime <![CDATA[ >= ]]> #{startTime}