添加消費記錄

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/AppUserController.java

@@ -150,11 +150,7 @@ public class AppUserController extends CommonBaseController{
             UserMemberVo memberVo=userMemberBiz.getMemberInfoByUserId(userid);
             if(memberVo!=null){
                 BeanUtils.copyProperties(userDTO,memberVo);
-//                userDTO.setPayCount(orderFeign.baseOrderEntityList(new BaseOrder(){{
-//                    setUserId(Integer.valueOf(BaseContextHandler.getUserID()));
-//                    setHasMemberRight(SYS_TRUE);
-////                    setS
-//                }}));
+                userDTO.setPayCount(orderFeign.baseOrderCount(SYS_TRUE, "1,4,5,6,7", userid).getData());
                 Integer level=memberVo.getMemberLevel();
                 BaseUserMemberLevel memberLevel=userMemberLevelBiz.getLevel(level);
                 if (memberLevel!=null){

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/feign/OrderFeign.java

@@ -19,6 +19,6 @@ import java.util.Set;
  */
 @FeignClient(name = "order")
 public interface OrderFeign {
-//    @GetMapping("/baseOrder/entityList")
-//    public ObjectRestResponse<List<BaseOrder>> baseOrderEntityList(@RequestParam("entity") Map<String, Object> entity);
+    @GetMapping("/baseOrder/count")
+    public ObjectRestResponse<Integer> baseOrderCount(Integer hasMemberRight, String multiStatus, Integer userId);
 }

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BaseOrderController.java

 package com.xxfc.platform.order.rest;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
@@ -54,8 +55,10 @@ import tk.mybatis.mapper.weekend.WeekendSqls;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import static com.xxfc.platform.universal.constant.DictionaryKey.APP_ORDER;
 
@@ -158,15 +161,26 @@ public class BaseOrderController extends CommonBaseController implements UserRes
     }
 
     @ApiOperation("查询个数")
-    @RequestMapping(value = "/entityList",method = RequestMethod.GET)
+    @RequestMapping(value = "/count",method = RequestMethod.GET)
     @ResponseBody
     public ObjectRestResponse<Integer> entityList(Integer hasMemberRight, String multiStatus, Integer userId){
         //查询列表数据
-        return null;
-//                ObjectRestResponse.succ(baseOrderBiz
-//                .selectCountByExample(new Example.Builder(BaseOrder.class)
-//                        .where(WeekendSqls.<BaseOrder>custom()
-//                        .andEqualTo(BaseOrder::getHasMemberRight).andIn(BaseOrder::get))));
+        WeekendSqls<BaseOrder> weekendSqls = WeekendSqls.<BaseOrder>custom();
+        if(null != hasMemberRight) {
+            weekendSqls.andEqualTo(BaseOrder::getHasMemberRight, hasMemberRight);
+        }
+        if(null != multiStatus) {
+            weekendSqls.andIn(BaseOrder::getStatus,
+                    StrUtil.splitTrim(multiStatus, ",")
+                            .parallelStream().map(v -> Integer.valueOf(v)).collect(Collectors.toList()));
+        }
+        if(null != userId) {
+            weekendSqls.andEqualTo(BaseOrder::getUserId, userId);
+        }
+//                null;
+        return ObjectRestResponse.succ(baseOrderBiz
+                .selectCountByExample( new Example.Builder(BaseOrder.class)
+                        .where(weekendSqls).build()));
     }
 
     @ApiOperation("订单详情")