bug fixes

src/main/java/com/caimei/controller/LoginApi.java

@@ -10,10 +10,9 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
 
 /**
  * Description
@@ -62,4 +61,17 @@ public class LoginApi {
         }
         return loginService.invitationCode(buyerUserDto);
     }
+
+    /**
+     * 个人中心数据
+     */
+    @ApiOperation("个人中心数据")
+    @ApiImplicitParam(name = "organizeId", value = "组织id", required = true)
+    @GetMapping("/personal")
+    public ResponseJson<Map<String, Object>> personalData(Integer organizeId) {
+        if (organizeId == null) {
+            return ResponseJson.error("参数异常", null);
+        }
+        return loginService.personalData(organizeId);
+    }
 }

src/main/java/com/caimei/controller/ProductApi.java

@@ -41,10 +41,12 @@ public class ProductApi {
     @ApiOperation("机构列表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "organizeId", required = true, value = "组织id"),
-            @ApiImplicitParam(name = "name", required = false, value = "机构名称/机构联系人")
+            @ApiImplicitParam(name = "name", required = false, value = "机构名称/机构联系人"),
+            @ApiImplicitParam(name = "pageNum", required = false, value = "第几页"),
+            @ApiImplicitParam(name = "pageSize", required = false, value = "一页多少条")
     })
     @GetMapping("/clubList")
-    public ResponseJson<PageInfo<ClubVo>> clubList(Integer organizeId, String name, int pageNum, int pageSize) {
+    public ResponseJson<PageInfo<ClubVo>> clubList(Integer organizeId, String name, Integer pageNum, Integer pageSize) {
         return productService.clubList(organizeId, name, pageNum, pageSize);
     }
 }

src/main/java/com/caimei/model/vo/BuyerUserVo.java

@@ -24,34 +24,4 @@ public class BuyerUserVo {
      * 小程序openid
      */
     private String openid;
-
-    /**
-     * 组织名称
-     */
-    private String organizeName;
-
-    /**
-     * 待确认数量
-     */
-    private Integer confirmedCount;
-
-    /**
-     * 待付款数量
-     */
-    private Integer paymentCount;
-
-    /**
-     * 待发货数量
-     */
-    private Integer waitShipmentsCount;
-
-    /**
-     * 已发货数量
-     */
-    private Integer shipmentsCount;
-
-    /**
-     * 退货款数量
-     */
-    private Integer salesReturnCount;
 }

src/main/java/com/caimei/service/LoginService.java

@@ -4,6 +4,8 @@ import com.caimei.model.ResponseJson;
 import com.caimei.model.dto.BuyerUserDto;
 import com.caimei.model.vo.BuyerUserVo;
 
+import java.util.Map;
+
 /**
  * Description
  *
@@ -27,4 +29,12 @@ public interface LoginService {
      * @return
      */
     ResponseJson<BuyerUserVo> invitationCode(BuyerUserDto buyerUserDto);
+
+    /**
+     * 个人中心数据
+     *
+     * @param organizeId
+     * @return
+     */
+    ResponseJson<Map<String, Object>> personalData(Integer organizeId);
 }

src/main/java/com/caimei/service/ProductService.java

@@ -20,5 +20,5 @@ public interface ProductService {
      * @param pageNum
      * @return
      */
-    ResponseJson<PageInfo<ClubVo>> clubList(Integer organizeId, String name, int pageNum, int pageSize);
+    ResponseJson<PageInfo<ClubVo>> clubList(Integer organizeId, String name, Integer pageNum, Integer pageSize);
 }

src/main/java/com/caimei/service/impl/LoginServiceImpl.java

@@ -74,7 +74,6 @@ public class LoginServiceImpl implements LoginService {
             buyerUser.setOpenid(openid);
             return ResponseJson.error("未绑定微信", buyerUser);
         }
-        getOrderCount(buyerUser);
         return ResponseJson.success(buyerUser);
     }
 
@@ -96,36 +95,35 @@ public class LoginServiceImpl implements LoginService {
         }
         loginMapper.updateBuyer(buyerUserDto);
         BuyerUserVo buyerUser = new BuyerUserVo();
-        getOrderCount(buyerUser);
         buyerUser.setOrganizeId(organize.getId());
-        buyerUser.setOrganizeName(organize.getOrganizeName());
         buyerUser.setOpenid(buyerUser.getOpenid());
         return ResponseJson.success(buyerUser);
     }
 
-    /**
-     * 统计订单数量
-     */
-    private void getOrderCount(BuyerUserVo buyerUser) {
+    @Override
+    public ResponseJson<Map<String, Object>> personalData(Integer organizeId) {
+        Map<String, Object> map = new HashMap<>(5);
+        CmMallOrganizePo organize = loginMapper.findOrganize(organizeId);
+        map.put("organizeName", organize.getOrganizeName());
         //待确认数量
-        Integer organizeId = buyerUser.getOrganizeId();
         Integer confirmedCount = loginMapper.findOrderCount(organizeId, 0);
-        buyerUser.setConfirmedCount(confirmedCount);
+        map.put("confirmedCount", confirmedCount);
         //待付款数量
         Integer paymentCount = loginMapper.findOrderCount(organizeId, 1);
         paymentCount = paymentCount == null ? 0 : paymentCount;
-        buyerUser.setPaymentCount(paymentCount);
+        map.put("paymentCount", paymentCount);
         //待发货数量
         Integer waitShipmentsCount = loginMapper.findOrderCount(organizeId, 2);
         waitShipmentsCount = waitShipmentsCount == null ? 0 : waitShipmentsCount;
-        buyerUser.setWaitShipmentsCount(waitShipmentsCount);
+        map.put("waitShipmentsCount", waitShipmentsCount);
         //已发货数量
         Integer shipmentsCount = loginMapper.findOrderCount(organizeId, 3);
         shipmentsCount = shipmentsCount == null ? 0 : shipmentsCount;
-        buyerUser.setShipmentsCount(shipmentsCount);
+        map.put("shipmentsCount", shipmentsCount);
         //退货款数量
         Integer salesReturnCount = loginMapper.findOrderCount(organizeId, 4);
         salesReturnCount = salesReturnCount == null ? 0 : salesReturnCount;
-        buyerUser.setSalesReturnCount(salesReturnCount);
+        map.put("salesReturnCount", salesReturnCount);
+        return ResponseJson.success(map);
     }
 }

src/main/java/com/caimei/service/impl/ProductServiceImpl.java

@@ -23,7 +23,9 @@ public class ProductServiceImpl implements ProductService {
     private ProductMapper productMapper;
 
     @Override
-    public ResponseJson<PageInfo<ClubVo>> clubList(Integer organizeId, String name, int pageNum, int pageSize) {
+    public ResponseJson<PageInfo<ClubVo>> clubList(Integer organizeId, String name, Integer pageNum, Integer pageSize) {
+        pageNum = pageNum == null ? 1 : pageNum;
+        pageSize = pageSize == null ? 10 : pageSize;
         PageHelper.startPage(pageNum, pageSize);
         List<ClubVo> clubList = productMapper.findClubList(organizeId, name);
         PageInfo<ClubVo> pageInfo = new PageInfo<>(clubList);