From 113f3a5d3b843fba68ce50a3ba3255c66ca1e15f Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 17 Jan 2023 20:13:57 +0800
Subject: [PATCH] 20221227 充值归集
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | 344 +++++++++++++++++++++++++++++---------------------------
1 files changed, 178 insertions(+), 166 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
index 4f7d45f..a80c406 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
@@ -14,10 +14,7 @@
import cc.mrbird.febs.mall.entity.*;
import cc.mrbird.febs.mall.mapper.*;
import cc.mrbird.febs.mall.service.*;
-import cc.mrbird.febs.mall.vo.ApiShopApplyVo;
-import cc.mrbird.febs.mall.vo.OrderDetailVo;
-import cc.mrbird.febs.mall.vo.OrderListVo;
-import cc.mrbird.febs.mall.vo.OrderRefundVo;
+import cc.mrbird.febs.mall.vo.*;
import cc.mrbird.febs.pay.model.AgreementPayDto;
import cc.mrbird.febs.pay.model.AgreementSignDto;
import cc.mrbird.febs.pay.model.UnipayDto;
@@ -25,6 +22,7 @@
import cc.mrbird.febs.pay.service.UnipayService;
import cc.mrbird.febs.rabbit.producter.AgentProducer;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUnit;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
@@ -43,6 +41,7 @@
import java.math.BigDecimal;
import java.text.DecimalFormat;
+import java.text.SimpleDateFormat;
import java.util.*;
/**
@@ -67,6 +66,7 @@
private final MallShoppingCartMapper mallShoppingCartMapper;
private final IApiMallMemberService memberService;
private final IMallMoneyFlowService mallMoneyFlowService;
+ private final MallMoneyFlowMapper mallMoneyFlowMapper;
private final RedisUtils redisUtils;
private final AgentProducer agentProducer;
@@ -77,15 +77,58 @@
private final MallMemberBankSignMapper mallMemberBankSignMapper;
private final MallMemberBankMapper mallMemberBankMapper;
private final MallShopApplyMapper mallShopApplyMapper;
+ private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
@Override
@Transactional(rollbackFor = Exception.class)
public Long createOrder(AddOrderDto addOrderDto) {
MallMember member = LoginUserUtil.getLoginUser();
+ /**
+ * 根据会员星级判断是否可以购买该商品
+ */
+ MallMember mallMember = memberMapper.selectById(member.getId());
+ String accountLevel = mallMember.getAccountLevel();
+ Integer memberLevelCode = MemberAccountLevelEnum.NORMAL.getMemberLevelCode(accountLevel);
+ //获取商品星级
+ MallGoods goods = mallGoodsMapper.selectById(addOrderDto.getGoodsId());
+ String starRating = goods.getStarRating();
+ Integer goodsStarCode = StarRatingEnum.NORMAL.getGoodsStarCode(starRating);
+ if(memberLevelCode < goodsStarCode){
+ throw new FebsException("会员等级不够");
+ }
+ if (MallGoods.ISSALE_STATUS_DISABLED.equals(goods.getIsSale())) {
+ throw new FebsException(goods.getGoodsName() + "已下架");
+ }
+ /**
+ * 存在未支付的订单无法下单
+ */
+ Integer orderIng = this.baseMapper.selectOrderInfoByStatusAndMemberId(OrderStatusEnum.FINISH.getValue(), mallMember.getId());
+ if(1 <= orderIng){
+ throw new FebsException("请先完成未完成的订单");
+ }
- MallAddressInfo address = mallAddressInfoMapper.selectAddressInfoByMemberIdAndId(member.getId(), addOrderDto.getAddressId());
- if (address == null) {
- throw new FebsException("地址不存在");
+ /**
+ * 会员一天最多下单次数
+ */
+ DataDictionaryCustom buyTimesDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.BUY_TIMES.getType(), DataDictionaryEnum.BUY_TIMES.getCode());
+ Integer buyTimes = Integer.parseInt(buyTimesDic.getValue());
+
+ DateTime date = DateUtil.date();
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ String yyyyMMdd = sdf.format(date);
+ Integer times = this.baseMapper.selectCountByCreateTimeAndMemberId(yyyyMMdd,member.getId());
+ if(buyTimes <= times){
+ throw new FebsException("今日任务完成,明天再来");
+ }
+
+ DataDictionaryCustom allBuyTimesDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.ALL_BUY_TIMES.getType(), DataDictionaryEnum.ALL_BUY_TIMES.getCode());
+ Integer allBuyTimes = Integer.parseInt(allBuyTimesDic.getValue());
+
+ Integer allBuyTimesNow = this.baseMapper.selectCountByCreateTime(yyyyMMdd);
+ if(allBuyTimes <= allBuyTimesNow){
+ throw new FebsException("今日任务完成,明天再来");
}
String orderNo = MallUtils.getOrderNum();
@@ -94,123 +137,49 @@
orderInfo.setOrderTime(new Date());
orderInfo.setMemberId(member.getId());
orderInfo.setStatus(OrderStatusEnum.WAIT_PAY.getValue());
- orderInfo.setName(address.getName());
- orderInfo.setAddress(address.getArea() + address.getAddress());
- orderInfo.setPhone(address.getPhone());
- orderInfo.setLatitude(address.getLatitude());
- orderInfo.setLongitude(address.getLongitude());
orderInfo.setRemark(addOrderDto.getRemark());
orderInfo.setOrderType(addOrderDto.getOrderType());
-
- if (CollUtil.isEmpty(addOrderDto.getItems())) {
- throw new FebsException("参数错误");
- }
-
- int deliverType = ObjectUtil.isEmpty(addOrderDto.getDeliverType()) ? 1 : addOrderDto.getDeliverType();
- if(2 == deliverType){
- if(ObjectUtil.isEmpty(addOrderDto.getShopId())){
- throw new FebsException("请选择门店");
- }
- Long shopId = addOrderDto.getShopId();
- MallShopApply mallShopApply = mallShopApplyMapper.selectById(shopId);
- if(ObjectUtil.isEmpty(mallShopApply)){
- throw new FebsException("请选择门店");
- }
- if(MallShopApply.APPLY_AGREE != mallShopApply.getStatus()){
- throw new FebsException("请选择门店");
- }
- orderInfo.setShopId(shopId);
- }
+ //补贴金额
+ orderInfo.setSubsidyAmount(goods.getSubsidyAmount());
+ orderInfo.setCommentState(MallOrderInfo.COMMENT_STATE_NO);
this.baseMapper.insert(orderInfo);
- BigDecimal total = BigDecimal.ZERO;
- BigDecimal carriage = BigDecimal.ZERO;
- for (AddOrderItemDto item : addOrderDto.getItems()) {
- MallOrderItem orderItem = new MallOrderItem();
-
- // 积分商品提交订单
- if (addOrderDto.getOrderType() == 2) {
- MallGoods mallGoods = mallGoodsMapper.selectById(item.getSkuId());
- if (mallGoods.getStock() < item.getCnt()) {
- throw new FebsException(mallGoods.getGoodsName() + "库存不足");
- }
-
- if (MallGoods.ISSALE_STATUS_DISABLED.equals(mallGoods.getIsSale())) {
- throw new FebsException(mallGoods.getGoodsName() + "已下架");
- }
-
- BigDecimal amount = mallGoods.getScore().multiply(BigDecimal.valueOf(item.getCnt()));
- orderItem.setAmount(amount);
- orderItem.setCnt(item.getCnt());
- orderItem.setOrderId(orderInfo.getId());
- orderItem.setPrice(mallGoods.getScore());
- orderItem.setGoodsId(mallGoods.getId());
- orderItem.setGoodsName(mallGoods.getGoodsName());
- orderItem.setStyleName(mallGoods.getGoodsName());
- orderItem.setSkuName(mallGoods.getGoodsName());
- orderItem.setSkuImage(mallGoods.getThumb());
-
- total = total.add(amount);
- } else {
- MallGoodsSku sku = mallGoodsSkuMapper.selectSkuInfoById(item.getSkuId());
+ List<MallGoodsSku> mallGoodsSkus = mallGoodsSkuMapper.selectSkuByGoodsId(goods.getId());
+ for (MallGoodsSku sku : mallGoodsSkus) {
+ MallOrderItem orderItem = new MallOrderItem();
if (sku == null) {
throw new FebsException("购买商品或sku不存在");
}
- if (sku.getStock() < item.getCnt()) {
+ if (sku.getStock() < 1) {
throw new FebsException(sku.getSkuName() + "库存不足");
}
- MallGoods mallGoods = mallGoodsMapper.selectById(sku.getGoodsId());
-
- // 零撸专区购买
- if (new BigDecimal(mallGoods.getPresentPrice()).compareTo(BigDecimal.ZERO) == 0) {
- List<MallOrderItem> items = mallOrderItemMapper.selectItemByGoodsIdUnCancel(mallGoods.getId(), member.getId());
- if (CollUtil.isNotEmpty(items)) {
- throw new FebsException("无法重复领取同一个商品");
- }
- }
-
- if (MallGoods.ISSALE_STATUS_DISABLED.equals(mallGoods.getIsSale())) {
- throw new FebsException(mallGoods.getGoodsName() + "已下架");
- }
-
- BigDecimal amount = sku.getPresentPrice().multiply(BigDecimal.valueOf(item.getCnt()));
+ BigDecimal amount = sku.getPresentPrice().multiply(BigDecimal.valueOf(1));
orderItem.setAmount(amount);
- orderItem.setCnt(item.getCnt());
+ orderItem.setCnt(1);
orderItem.setOrderId(orderInfo.getId());
orderItem.setPrice(sku.getPresentPrice());
orderItem.setGoodsId(sku.getGoodsId());
- orderItem.setGoodsName(sku.getGoodsName());
+ orderItem.setGoodsName(goods.getGoodsName());
orderItem.setSkuId(sku.getId());
orderItem.setStyleName(sku.getStyleName());
orderItem.setSkuName(sku.getSkuName());
orderItem.setSkuImage(sku.getSkuImage());
- orderItem.setIsNormal(mallGoods.getIsNormal());
+ orderItem.setIsNormal(goods.getIsNormal());
orderItem.setCostPrice(sku.getCostPrice());
- total = total.add(amount);
- carriage = carriage.add(mallGoods.getCarriage());
-
- sku.setStock(sku.getStock() - item.getCnt());
- sku.setSkuVolume(sku.getSkuVolume() + item.getCnt());
+ sku.setStock(sku.getStock() - 1);
+ sku.setSkuVolume(sku.getSkuVolume() + 1);
mallGoodsSkuMapper.updateById(sku);
- if (addOrderDto.getType() == 1) {
+ if (1 == addOrderDto.getType() ) {
mallShoppingCartMapper.delBySkuId(sku.getId(), member.getId());
}
- }
- mallOrderItemMapper.insert(orderItem);
+ mallOrderItemMapper.insert(orderItem);
}
-
- orderInfo.setAmount(total);
- if(2 == deliverType){
- orderInfo.setDeliverType(2);
- orderInfo.setCarriage(BigDecimal.ZERO);
- }else{
- orderInfo.setDeliverType(1);
- orderInfo.setCarriage(carriage);
- }
+ BigDecimal presentPrice = new BigDecimal(goods.getPresentPrice()).setScale(2,BigDecimal.ROUND_DOWN);
+ orderInfo.setAmount(presentPrice);
this.baseMapper.updateById(orderInfo);
agentProducer.sendOrderCancelDelayMsg(orderInfo.getId(), 15 * 60 * 1000L);
@@ -255,10 +224,11 @@
if (OrderStatusEnum.WAIT_PAY.getValue() != orderInfo.getStatus()) {
throw new FebsException("订单状态不能支付");
}
-
+ String type = payOrderDto.getType();
+ type = type == "3" ? type : "3";
String payResultStr = "";
String rcResult = "";
- switch (payOrderDto.getType()) {
+ switch (type) {
case "1":
UnipayDto unipayDtoWx = new UnipayDto();
// unipayDto.setAmount(new BigDecimal("0.01"));
@@ -322,50 +292,31 @@
orderInfo.setPayOrderNo(orderInfo.getOrderNo());
orderInfo.setPayMethod("余额支付");
- orderInfo.setStatus(OrderStatusEnum.WAIT_SHIPPING.getValue());
+// orderInfo.setStatus(OrderStatusEnum.WAIT_SHIPPING.getValue());
+ //订单支付成功后，订单直接变成待收货
+ orderInfo.setStatus(OrderStatusEnum.WAIT_FINISH.getValue());
+ //生成物流编号
+ String logisticsNo = MallUtils.getLogisticsNum(StrUtil.subSuf(payResultStr, payResultStr.length() - 2));
+ orderInfo.setPayTradeNo(logisticsNo);
orderInfo.setPayTime(new Date());
orderInfo.setPayResult("1");
- boolean hasTc = false;
- // 静态倍数
- List<MallOrderItem> orderItems = this.baseMapper.getMallOrderItemByOrderId(orderInfo.getId());
- if (CollUtil.isNotEmpty(orderItems)) {
- for (MallOrderItem orderItem : orderItems) {
- MallGoods mallGoods = mallGoodsMapper.selectById(orderItem.getGoodsId());
- BigDecimal score = BigDecimal.ZERO;
- MallGoodsSku sku = mallGoodsSkuMapper.selectById(orderItem.getSkuId());
- if (mallGoods.getIsNormal() == 2) {
- hasTc = true;
- score = sku.getPresentPrice().multiply(mallGoods.getStaticMulti()).multiply(new BigDecimal(orderItem.getCnt()));
-// BigDecimal staticMulti = mallGoods.getStaticMulti() == null ? BigDecimal.ZERO : mallGoods.getStaticMulti();
-// score = sku.getPresentPrice().multiply(staticMulti);
- // 普通商品也及时结算，不再10天结算
- } else {
- score = sku.getPresentPrice();
- }
+// mallMoneyFlowService.addMoneyFlow(member.getId(), orderInfo.getAmount().negate(), MoneyFlowTypeEnum.PAY.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.BALANCE.getValue());
+ /**
+ * 生成下单的流水记录
+ */
+ Long payFlowId = mallMoneyFlowService.addMoneyFlow(
+ member.getId(),
+ orderInfo.getOrderNo(),
+ orderInfo.getAmount().negate().setScale(2, BigDecimal.ROUND_DOWN),
+ MallMoneyFlowTypeEnum.PAY.getCode(),
+ MallMoneyFlow.STATUS_SUCCESS,
+ MallMoneyFlow.IS_RETURN_N,
+ member.getId(),
+ FlowTypeEnum.BALANCE.getValue(),
+ MallMoneyFlowTypeEnum.PAY.getName()
+ );
- if (score.compareTo(BigDecimal.ZERO) > 0) {
- memberWalletService.add(score, member.getId(), "score");
- mallMoneyFlowService.addMoneyFlow(member.getId(), score, MoneyFlowTypeEnum.STATIC_BONUS.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.SCORE.getValue());
-
- // 添加业绩
- mallAchieveService.add(orderItem.getId());
- }
- }
- }
-
- // 购买套餐后，升级为普通会员
- if (hasTc) {
- MallMember mallMember = memberMapper.selectById(member.getId());
- if (AgentLevelEnum.ZERO_LEVEL.name().equals(mallMember.getLevel())) {
- mallMember.setLevel(AgentLevelEnum.FIRST_LEVEL.name());
- memberMapper.updateById(mallMember);
- }
- }
-
- mallMoneyFlowService.addMoneyFlow(member.getId(), orderInfo.getAmount().negate(), MoneyFlowTypeEnum.PAY.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.BALANCE.getValue());
- agentProducer.sendAutoLevelUpMsg(member.getId());
- agentProducer.sendOrderReturn(orderInfo.getId());
break;
case "4":
if (orderInfo.getOrderType() != 2) {
@@ -513,17 +464,18 @@
OrderDetailVo orderDetailVo = MallOrderInfoConversion.INSTANCE.entityToDetailVo(orderInfo);
- if (orderInfo.getStatus() == OrderStatusEnum.WAIT_FINISH.getValue()) {
- MallExpressInfo expressInfo = expressInfoMapper.selectByOrderId(orderInfo.getId());
- orderDetailVo.setExpressNo(expressInfo.getExpressNo());
- orderDetailVo.setExpressCom(expressInfo.getExpressCom());
- }
+// Integer deliverType = (ObjectUtil.isEmpty(orderInfo.getDeliverType()) ? new Integer(0):orderInfo.getDeliverType());
+// if (orderInfo.getStatus() == OrderStatusEnum.WAIT_FINISH.getValue() && 2 != deliverType) {
+// MallExpressInfo expressInfo = expressInfoMapper.selectByOrderId(orderInfo.getId());
+// orderDetailVo.setExpressNo(expressInfo.getExpressNo());
+// orderDetailVo.setExpressCom(expressInfo.getExpressCom());
+// }
- if (orderInfo.getStatus() == OrderStatusEnum.REFUNDING.getValue() || orderInfo.getStatus() == OrderStatusEnum.REFUNDED.getValue()) {
- MallOrderRefund orderRefund = mallOrderRefundMapper.selectOrderRefundByOrderId(orderInfo.getId());
- OrderRefundVo orderRefundVo = MallOrderRefundConversion.INSTANCE.entityToVo(orderRefund);
- orderDetailVo.setOrderRefund(orderRefundVo);
- }
+// if (orderInfo.getStatus() == OrderStatusEnum.REFUNDING.getValue() || orderInfo.getStatus() == OrderStatusEnum.REFUNDED.getValue()) {
+// MallOrderRefund orderRefund = mallOrderRefundMapper.selectOrderRefundByOrderId(orderInfo.getId());
+// OrderRefundVo orderRefundVo = MallOrderRefundConversion.INSTANCE.entityToVo(orderRefund);
+// orderDetailVo.setOrderRefund(orderRefundVo);
+// }
if (OrderStatusEnum.WAIT_PAY.getValue() == orderInfo.getStatus()) {
Date endTime = DateUtil.offsetMinute(orderInfo.getOrderTime(), 15);
@@ -531,21 +483,20 @@
long remainTime = DateUtil.between(new Date(), endTime, DateUnit.SECOND, false);
orderDetailVo.setRemainTime(remainTime);
}
- Integer deliverType = orderInfo.getDeliverType();
- if(2 == deliverType){
- MallShopApply mallShopApply = mallShopApplyMapper.selectById(orderInfo.getShopId());
- if(ObjectUtil.isNotEmpty(mallShopApply)){
- ApiShopApplyVo apiShopApplyVo = new ApiShopApplyVo();
- apiShopApplyVo.setName(mallShopApply.getName());
- apiShopApplyVo.setPhone(mallShopApply.getPhone());
- apiShopApplyVo.setSaleArea(mallShopApply.getSaleArea());
- apiShopApplyVo.setLatitude(mallShopApply.getLatitude());
- apiShopApplyVo.setLongitude(mallShopApply.getLongitude());
- apiShopApplyVo.setShopName(mallShopApply.getShopName());
- apiShopApplyVo.setAddress(mallShopApply.getAddress());
- orderDetailVo.setApiShopApplyVo(apiShopApplyVo);
- }
- }
+// if(2 == deliverType){
+// MallShopApply mallShopApply = mallShopApplyMapper.selectById(orderInfo.getShopId());
+// if(ObjectUtil.isNotEmpty(mallShopApply)){
+// ApiShopApplyVo apiShopApplyVo = new ApiShopApplyVo();
+// apiShopApplyVo.setName(mallShopApply.getName());
+// apiShopApplyVo.setPhone(mallShopApply.getPhone());
+// apiShopApplyVo.setSaleArea(mallShopApply.getSaleArea());
+// apiShopApplyVo.setLatitude(mallShopApply.getLatitude());
+// apiShopApplyVo.setLongitude(mallShopApply.getLongitude());
+// apiShopApplyVo.setShopName(mallShopApply.getShopName());
+// apiShopApplyVo.setAddress(mallShopApply.getAddress());
+// orderDetailVo.setApiShopApplyVo(apiShopApplyVo);
+// }
+// }
return orderDetailVo;
}
@@ -565,6 +516,23 @@
orderInfo.setStatus(OrderStatusEnum.FINISH.getValue());
orderInfo.setReceivingTime(new Date());
this.baseMapper.updateById(orderInfo);
+// /**
+// * 通过支付流水记录，返回下单金额
+// */
+// MallMoneyFlow payFlow = mallMoneyFlowMapper.selectOneByMemberIdAndOrderNoAndTypeAndStatusAndIsReturn(
+// member.getId(),
+// orderInfo.getOrderNo(),
+// MallMoneyFlowTypeEnum.PAY.getCode(),
+// MallMoneyFlow.STATUS_SUCCESS,
+// MallMoneyFlow.IS_RETURN_N);
+// if(ObjectUtil.isNotEmpty(payFlow)){
+// memberWalletService.addBalance(payFlow.getAmount().negate(),payFlow.getRtMemberId());
+// payFlow.setIsReturn(MallMoneyFlow.IS_RETURN_Y);
+// mallMoneyFlowMapper.updateById(payFlow);
+// }
+// //产生补贴流水记录
+// agentProducer.sendDirectRewardMsg(orderInfo.getId());
+
}
@Override
@@ -697,13 +665,30 @@
orderInfo.setCommentState(MallOrderInfo.COMMENT_STATE_YES);
this.baseMapper.updateById(orderInfo);
+ /**
+ * 通过支付流水记录，返回下单金额
+ */
+ MallMoneyFlow payFlow = mallMoneyFlowMapper.selectOneByMemberIdAndOrderNoAndTypeAndStatusAndIsReturn(
+ member.getId(),
+ orderInfo.getOrderNo(),
+ MallMoneyFlowTypeEnum.PAY.getCode(),
+ MallMoneyFlow.STATUS_SUCCESS,
+ MallMoneyFlow.IS_RETURN_N);
+ if(ObjectUtil.isNotEmpty(payFlow)){
+ memberWalletService.addBalance(payFlow.getAmount().negate(),payFlow.getRtMemberId());
+ payFlow.setIsReturn(MallMoneyFlow.IS_RETURN_Y);
+ mallMoneyFlowMapper.updateById(payFlow);
+ }
+ //产生补贴流水记录
+ agentProducer.sendDirectRewardMsg(orderInfo.getId());
List<ApiAddCommentDto> apiAddCommentDtos = addCommentDtos.getApiAddCommentDtos();
if(CollUtil.isNotEmpty(apiAddCommentDtos)){
for(ApiAddCommentDto apiAddCommentDto : apiAddCommentDtos){
Long skuId = apiAddCommentDto.getSkuId();
- MallGoodsSku mallGoodsSku = mallGoodsSkuMapper.selectById(skuId);
Long goodsId = apiAddCommentDto.getGoodsId();
+ List<MallGoodsSku> mallGoodsSkus = mallGoodsSkuMapper.selectSkuByGoodsId(goodsId);
+ MallGoodsSku mallGoodsSku = mallGoodsSkus.get(0);
MallGoods mallGoods = mallGoodsMapper.selectById(goodsId);
MallGoodsComment mallGoodsComment = MallGoodsCommentConversion.INSTANCE.dtoToEntity(apiAddCommentDto);
mallGoodsComment.setMemberId(member.getId());
@@ -731,4 +716,31 @@
}
}
+ @Override
+ public FebsResponse subsidyAmountInfo() {
+ MallMember member = LoginUserUtil.getLoginUser();
+ ApiMallSubsidyAmountInfoVo apiMallSubsidyAmountInfoVo = new ApiMallSubsidyAmountInfoVo();
+ DateTime today = DateUtil.date();
+ DateTime yesterday = DateUtil.yesterday();
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ String yyyyMMddToday = sdf.format(today);
+ String yyyyMMddYesterday = sdf.format(yesterday);
+ //今日补贴
+ BigDecimal todayAmount = this.baseMapper.selectTodayAmountByCreateTimeAndMemberId(yyyyMMddToday,member.getId());
+ apiMallSubsidyAmountInfoVo.setTodayAmount(todayAmount);
+ //累计接单
+ Integer todayTotalCnt = this.baseMapper.selectCountByCreateTimeAndMemberId(null,member.getId());
+ apiMallSubsidyAmountInfoVo.setTodayTotalCnt(todayTotalCnt);
+ //昨日补贴
+ BigDecimal yesterdayAmount = this.baseMapper.selectTodayAmountByCreateTimeAndMemberId(yyyyMMddYesterday,member.getId());
+ apiMallSubsidyAmountInfoVo.setYesterdayAmount(yesterdayAmount);
+ //昨日累计接单
+ Integer totalYesterdayCnt = this.baseMapper.selectCountByCreateTimeAndMemberId(yyyyMMddYesterday,member.getId());
+ apiMallSubsidyAmountInfoVo.setTotalYesterdayCnt(totalYesterdayCnt);
+ //获得总额
+ BigDecimal totalAmount = this.baseMapper.selectTodayAmountByCreateTimeAndMemberId(null,member.getId());
+ apiMallSubsidyAmountInfoVo.setTotalAmount(totalAmount);
+ return new FebsResponse().success().data(apiMallSubsidyAmountInfoVo);
+ }
+
}
--
Gitblit v1.9.1