From 17100b75f8d8f68157c00048d5d97b5eab1093b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E4=B9=90?= <419641032@qq.com> Date: Wed, 26 Aug 2020 18:02:40 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E9=87=91=E6=98=8E=E7=BB=86=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/user.js | 2 +- app/config/app.js | 2 +- app/main.js | 2 +- app/pages/users/user_bill/index.vue | 4 +-- app/pages/users/user_money/index.vue | 6 ++-- .../finance/service/UserRechargeService.java | 2 ++ .../service/impl/UserRechargeServiceImpl.java | 22 +++++++++++++ .../front/controller/UserController.java | 2 +- .../service/impl/UserCenterServiceImpl.java | 31 ++++++++++++++----- .../service/impl/RechargePayServiceImpl.java | 2 +- .../crmeb/user/service/UserBillService.java | 2 +- .../service/impl/UserBillServiceImpl.java | 23 +++++++------- 12 files changed, 70 insertions(+), 30 deletions(-) diff --git a/app/api/user.js b/app/api/user.js index 6dfacc97..2080f364 100644 --- a/app/api/user.js +++ b/app/api/user.js @@ -122,7 +122,7 @@ export function userActivity(){ } /* - * 资金明细（types|0=全部,1=消费,2=充值,3=返佣,4=提现） + * 余额明细（types|2=全部,1=支出,2=收入） * */ export function getCommissionInfo(q, types) { return request.get("spread/commission/" + types, q); diff --git a/app/config/app.js b/app/config/app.js index 39ef331e..41f83446 100644 --- a/app/config/app.js +++ b/app/config/app.js @@ -26,4 +26,4 @@ module.exports = { TOKENNAME: 'Authori-zation', // 缓存时间 0 永久 EXPIRE:0, -}; \ No newline at end of file +}; diff --git a/app/main.js b/app/main.js index 32ef9411..ac9ea62e 100644 --- a/app/main.js +++ b/app/main.js @@ -55,4 +55,4 @@ const app = new Vue({ store, Cache }) -app.$mount(); \ No newline at end of file +app.$mount(); diff --git a/app/pages/users/user_bill/index.vue b/app/pages/users/user_bill/index.vue index afb3920a..ab002045 100644 --- a/app/pages/users/user_bill/index.vue +++ b/app/pages/users/user_bill/index.vue @@ -3,8 +3,8 @@ 全部 - 消费 - 充值 + 支出 + 收入 diff --git a/app/pages/users/user_money/index.vue b/app/pages/users/user_money/index.vue index 53e34ea4..ec6e919a 100644 --- a/app/pages/users/user_money/index.vue +++ b/app/pages/users/user_money/index.vue @@ -18,11 +18,11 @@ - 累计充值(元) + 累计收入(元) {{statistics.recharge || 0}} - 累计消费(元) + 累计支出(元) {{statistics.orderStatusSum || 0}} @@ -39,7 +39,7 @@ - 消费记录 + 支出记录 diff --git a/crmeb/src/main/java/com/zbkj/crmeb/finance/service/UserRechargeService.java b/crmeb/src/main/java/com/zbkj/crmeb/finance/service/UserRechargeService.java index d843dbc0..f6e9c39d 100644 --- a/crmeb/src/main/java/com/zbkj/crmeb/finance/service/UserRechargeService.java +++ b/crmeb/src/main/java/com/zbkj/crmeb/finance/service/UserRechargeService.java @@ -27,4 +27,6 @@ public interface UserRechargeService extends IService { UserRecharge create(UserRechargeRequest request); Boolean complete(UserRecharge userRecharge); + + BigDecimal getSumBigDecimal(Integer uid); } \ No newline at end of file diff --git a/crmeb/src/main/java/com/zbkj/crmeb/finance/service/impl/UserRechargeServiceImpl.java b/crmeb/src/main/java/com/zbkj/crmeb/finance/service/impl/UserRechargeServiceImpl.java index b344b137..3a40d16c 100644 --- a/crmeb/src/main/java/com/zbkj/crmeb/finance/service/impl/UserRechargeServiceImpl.java +++ b/crmeb/src/main/java/com/zbkj/crmeb/finance/service/impl/UserRechargeServiceImpl.java @@ -1,6 +1,7 @@ package com.zbkj.crmeb.finance.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.common.PageParamRequest; import com.constants.Constants; @@ -146,5 +147,26 @@ public class UserRechargeServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); + + + queryWrapper.select("sum(price) as price"). + eq("uid", userId). + eq("paid", 1); + UserRecharge userRecharge = dao.selectOne(queryWrapper); + if(null == userRecharge || null == userRecharge.getPrice()){ + return BigDecimal.ZERO; + } + return userRecharge.getPrice(); + } } diff --git a/crmeb/src/main/java/com/zbkj/crmeb/front/controller/UserController.java b/crmeb/src/main/java/com/zbkj/crmeb/front/controller/UserController.java index d23304dd..dde787df 100644 --- a/crmeb/src/main/java/com/zbkj/crmeb/front/controller/UserController.java +++ b/crmeb/src/main/java/com/zbkj/crmeb/front/controller/UserController.java @@ -144,7 +144,7 @@ public class UserController { */ @ApiOperation(value = "推广佣金明细") @RequestMapping(value = "/spread/commission/{type}", method = RequestMethod.GET) - @ApiImplicitParam(name = "type", value = "类型 佣金类型|0=全部,1=消费,2=充值,3=返佣,4=提现", allowableValues = "range[0,1,2,3,4]", dataType = "int") + @ApiImplicitParam(name = "type", value = "类型 佣金类型|0=全部,1=支出,2=收入,3=佣金明细", allowableValues = "range[0,1,2,3]", dataType = "int") public CommonResult> getSpreadCommissionByType(@PathVariable int type, @Validated PageParamRequest pageParamRequest){ return CommonResult.success(CommonPage.restPage(userCenterService.getSpreadCommissionByType(type, pageParamRequest))); } diff --git a/crmeb/src/main/java/com/zbkj/crmeb/front/service/impl/UserCenterServiceImpl.java b/crmeb/src/main/java/com/zbkj/crmeb/front/service/impl/UserCenterServiceImpl.java index c18012a6..cba05542 100644 --- a/crmeb/src/main/java/com/zbkj/crmeb/front/service/impl/UserCenterServiceImpl.java +++ b/crmeb/src/main/java/com/zbkj/crmeb/front/service/impl/UserCenterServiceImpl.java @@ -33,7 +33,6 @@ import com.zbkj.crmeb.user.model.UserBill; import com.zbkj.crmeb.user.model.UserToken; import com.zbkj.crmeb.user.request.RegisterThirdUserRequest; import com.zbkj.crmeb.user.request.UserOperateFundsRequest; -import com.zbkj.crmeb.user.service.UserAddressService; import com.zbkj.crmeb.user.service.UserBillService; import com.zbkj.crmeb.user.service.UserService; import com.zbkj.crmeb.user.service.UserTokenService; @@ -99,8 +98,6 @@ public class UserCenterServiceImpl extends ServiceImpl implements @Autowired private WeChatService weChatService; - @Autowired - private UserAddressService userAddressService; /** @@ -112,8 +109,10 @@ public class UserCenterServiceImpl extends ServiceImpl implements public UserCommissionResponse getCommission() { UserCommissionResponse userCommissionResponse = new UserCommissionResponse(); //昨天的佣金 - userCommissionResponse.setLastDayCount(userBillService.getSumBigDecimal(0, userService.getUserIdException(), Constants.USER_BILL_CATEGORY_MONEY, Constants.SEARCH_DATE_YESTERDAY, null)); - userCommissionResponse.setExtractCount(userBillService.getSumBigDecimal(0, userService.getUserIdException(), Constants.USER_BILL_CATEGORY_MONEY, null, Constants.USER_BILL_TYPE_EXTRACT)); + userCommissionResponse.setLastDayCount(userBillService.getSumBigDecimal(0, userService.getUserIdException(), Constants.USER_BILL_CATEGORY_BROKERAGE_PRICE, Constants.SEARCH_DATE_YESTERDAY, null)); + + userCommissionResponse.setExtractCount(userBillService.getSumBigDecimal(0, userService.getUserIdException(), Constants.USER_BILL_CATEGORY_BROKERAGE_PRICE, null, Constants.USER_BILL_TYPE_EXTRACT)); + userCommissionResponse.setCommissionCount(userService.getInfo().getBrokeragePrice()); return userCommissionResponse; } @@ -126,7 +125,25 @@ public class UserCenterServiceImpl extends ServiceImpl implements */ @Override public PageInfo getSpreadCommissionByType(int type, PageParamRequest pageParamRequest) { - return userBillService.getListGroupByMonth(userService.getUserIdException(), type, pageParamRequest); + Integer pm = null; + String category = Constants.USER_BILL_CATEGORY_MONEY; + switch (type){ + case 1: + pm = 0; + break; + case 2: + pm = 1; + break; + case 3: + category = Constants.USER_BILL_CATEGORY_BROKERAGE_PRICE; + break; + case 4: + return null; + default: + break; + + } + return userBillService.getListGroupByMonth(userService.getUserIdException(), pm, pageParamRequest, category); } /** @@ -275,7 +292,7 @@ public class UserCenterServiceImpl extends ServiceImpl implements @Override public UserBalanceResponse getUserBalance() { User info = userService.getInfo(); - BigDecimal recharge = userBillService.getSumBigDecimal(1, info.getUid(), Constants.USER_BILL_CATEGORY_MONEY, null, Constants.USER_BILL_TYPE_RECHARGE); + BigDecimal recharge = userBillService.getSumBigDecimal(1, info.getUid(), Constants.USER_BILL_CATEGORY_MONEY, null, null); BigDecimal orderStatusSum = storeOrderService.getSumBigDecimal(info.getUid(), null); return new UserBalanceResponse(info.getBrokeragePrice(), recharge, orderStatusSum); } diff --git a/crmeb/src/main/java/com/zbkj/crmeb/payment/service/impl/RechargePayServiceImpl.java b/crmeb/src/main/java/com/zbkj/crmeb/payment/service/impl/RechargePayServiceImpl.java index 1062ca20..2fd70d9f 100644 --- a/crmeb/src/main/java/com/zbkj/crmeb/payment/service/impl/RechargePayServiceImpl.java +++ b/crmeb/src/main/java/com/zbkj/crmeb/payment/service/impl/RechargePayServiceImpl.java @@ -154,7 +154,7 @@ public class RechargePayServiceImpl extends PayService implements RechargePaySer //余额变动 UserOperateFundsRequest userOperateFundsRequest = new UserOperateFundsRequest(); userOperateFundsRequest.setValue(getUserRecharge().getPrice().add(getUserRecharge().getGivePrice())); - userOperateFundsRequest.setFoundsType(Constants.ORDER_LOG_PAY_SUCCESS); + userOperateFundsRequest.setFoundsType(Constants.USER_BILL_TYPE_PAY_RECHARGE); userOperateFundsRequest.setUid(getUserRecharge().getUid()); userOperateFundsRequest.setTitle("充值支付"); userOperateFundsRequest.setFoundsCategory(Constants.USER_BILL_CATEGORY_MONEY); diff --git a/crmeb/src/main/java/com/zbkj/crmeb/user/service/UserBillService.java b/crmeb/src/main/java/com/zbkj/crmeb/user/service/UserBillService.java index 975897fb..56206820 100644 --- a/crmeb/src/main/java/com/zbkj/crmeb/user/service/UserBillService.java +++ b/crmeb/src/main/java/com/zbkj/crmeb/user/service/UserBillService.java @@ -28,7 +28,7 @@ public interface UserBillService extends IService { BigDecimal getSumBigDecimal(Integer pm, Integer userId, String category, String date, String type); - PageInfo getListGroupByMonth(Integer userId, int type, PageParamRequest pageParamRequest); + PageInfo getListGroupByMonth(Integer userId, Integer type, PageParamRequest pageParamRequest, String category); boolean saveRefundBill(StoreOrderRefundRequest request, User user); diff --git a/crmeb/src/main/java/com/zbkj/crmeb/user/service/impl/UserBillServiceImpl.java b/crmeb/src/main/java/com/zbkj/crmeb/user/service/impl/UserBillServiceImpl.java index 26376c96..75fb1926 100644 --- a/crmeb/src/main/java/com/zbkj/crmeb/user/service/impl/UserBillServiceImpl.java +++ b/crmeb/src/main/java/com/zbkj/crmeb/user/service/impl/UserBillServiceImpl.java @@ -299,21 +299,20 @@ public class UserBillServiceImpl extends ServiceImpl impl } /** - * 按照月份分组 + * 按照月份分组, 余额 * @author Mr.Zhang * @since 2020-06-08 * @return CommonPage */ @Override - public PageInfo getListGroupByMonth(Integer userId, int type, PageParamRequest pageParamRequest) { + public PageInfo getListGroupByMonth(Integer userId, Integer pm, PageParamRequest pageParamRequest, String category) { Page userBillPage = PageHelper.startPage(pageParamRequest.getPage(), pageParamRequest.getLimit()); ArrayList userSpreadCommissionResponseList = new ArrayList<>(); QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("uid", userId).eq("status", 1); - ArrayList typeList = getTypeList(type); - if(typeList.size() > 0){ - queryWrapper.in("type", typeList); + queryWrapper.eq("uid", userId).eq("status", 1).eq("category", category); + if(null != pm){ + queryWrapper.eq("pm", pm); } queryWrapper.groupBy("left(create_time, 7)"); @@ -325,7 +324,7 @@ public class UserBillServiceImpl extends ServiceImpl impl for (UserBill userBill : list) { String date = DateUtil.dateToStr(userBill.getCreateTime(), Constants.DATE_FORMAT_MONTH); - userSpreadCommissionResponseList.add(new UserSpreadCommissionResponse(date, getListByMonth(userId, type, date))); + userSpreadCommissionResponseList.add(new UserSpreadCommissionResponse(date, getListByMonth(userId, pm, date, category))); } return CommonPage.copyPageInfo(userBillPage, userSpreadCommissionResponseList); @@ -409,13 +408,13 @@ public class UserBillServiceImpl extends ServiceImpl impl * @since 2020-06-08 * @return List */ - private List getListByMonth(Integer userId, int type, String month) { + private List getListByMonth(Integer userId, Integer pm, String month, String category) { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.select("pm,title,number,create_time").eq("uid", userId). eq("status", 1).eq("left(create_time, 7)", month); - ArrayList typeList = getTypeList(type); - if(typeList.size() > 0){ - queryWrapper.in("type", typeList); + queryWrapper.select("pm,title,number,create_time").eq("uid", userId). eq("status", 1).eq("left(create_time, 7)", month).eq("category", category); + if(null != pm){ + queryWrapper.eq("pm", pm); } + queryWrapper.orderByDesc("create_time"); return dao.selectList(queryWrapper); }