From 53391a949929195b3341a683d64b82364fa8cf6e Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 22 Dec 2022 15:39:21 +0800
Subject: [PATCH] 20221221
---
src/main/java/cc/mrbird/febs/mall/mapper/MallOrderInfoMapper.java | 2
src/main/java/cc/mrbird/febs/mall/quartz/OrderOvertimeJob.java | 9 ++
src/main/java/cc/mrbird/febs/mall/controller/ApiMallOrderController.java | 11 +++
src/main/java/cc/mrbird/febs/mall/service/IApiMallOrderInfoService.java | 2
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | 32 +++++++++-
src/main/java/cc/mrbird/febs/mall/vo/AdminMallMoneyFlowVo.java | 2
src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java | 2
src/main/java/cc/mrbird/febs/mall/vo/ApiMallSubsidyAmountInfoVo.java | 28 +++++++++
src/main/resources/mapper/modules/MallOrderInfoMapper.xml | 22 ++++++-
src/main/resources/mapper/modules/MallMoneyFlowMapper.xml | 7 ++
src/main/resources/templates/febs/views/modules/order/orderMoneyFlow.html | 17 -----
11 files changed, 109 insertions(+), 25 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java
index 5cf3160..3a6f67e 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java
@@ -437,7 +437,7 @@
if (parentId == null) {
ViewMallOrderController.seeOrderFlowByOrderId = 0;
}
- mallOrderInfo.setId(ViewMallMemberController.idFromMoneyFlow);
+ mallOrderInfo.setId(ViewMallOrderController.seeOrderFlowByOrderId);
Map<String, Object> dataTable = getDataTable(adminMallOrderService.moneyFlow(request, mallOrderInfo));
return new FebsResponse().success().data(dataTable);
}
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/ApiMallOrderController.java b/src/main/java/cc/mrbird/febs/mall/controller/ApiMallOrderController.java
index 2c293f7..0a2e412 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ApiMallOrderController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ApiMallOrderController.java
@@ -3,6 +3,8 @@
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.mall.dto.*;
import cc.mrbird.febs.mall.service.IApiMallOrderInfoService;
+import cc.mrbird.febs.mall.vo.ApiMallSubsidyAmountInfoVo;
+import cc.mrbird.febs.mall.vo.MallMemberVo;
import cc.mrbird.febs.mall.vo.OrderDetailVo;
import cc.mrbird.febs.mall.vo.OrderListVo;
import io.swagger.annotations.Api;
@@ -117,4 +119,13 @@
return mallOrderInfoService.bangCardSign(bangCardSignDto);
}
+ @ApiOperation(value = "获取订单补贴信息", notes = "获取订单补贴信息")
+ @ApiResponses({
+ @ApiResponse(code = 200, message = "success", response = ApiMallSubsidyAmountInfoVo.class)
+ })
+ @GetMapping(value = "/subsidyAmountInfo")
+ public FebsResponse subsidyAmountInfo() {
+ return mallOrderInfoService.subsidyAmountInfo();
+ }
+
}
diff --git a/src/main/java/cc/mrbird/febs/mall/mapper/MallOrderInfoMapper.java b/src/main/java/cc/mrbird/febs/mall/mapper/MallOrderInfoMapper.java
index 2671ca1..44250e4 100644
--- a/src/main/java/cc/mrbird/febs/mall/mapper/MallOrderInfoMapper.java
+++ b/src/main/java/cc/mrbird/febs/mall/mapper/MallOrderInfoMapper.java
@@ -67,4 +67,6 @@
BigDecimal selectSumAmountByPayMethodAndSomeStatue(@Param("payMethod")String name, @Param("statues") List<Long> values);
Integer selectCountByCreateTimeAndMemberId(@Param("createdTime")String yyyyMMdd,@Param("memberId")Long memberId);
+
+ BigDecimal selectTodayAmountByCreateTimeAndMemberId(@Param("createdTime")String yyyyMMdd,@Param("memberId")Long memberId);
}
diff --git a/src/main/java/cc/mrbird/febs/mall/quartz/OrderOvertimeJob.java b/src/main/java/cc/mrbird/febs/mall/quartz/OrderOvertimeJob.java
index cb00b93..5481d86 100644
--- a/src/main/java/cc/mrbird/febs/mall/quartz/OrderOvertimeJob.java
+++ b/src/main/java/cc/mrbird/febs/mall/quartz/OrderOvertimeJob.java
@@ -155,9 +155,16 @@
if(BigDecimal.ZERO.compareTo(avaAmount) >= 0){
mallMemberStarBuyMapper.updateStatusById(2,mallMemberStarBuy.getId());
List<MallMemberStarBuy> mallMemberStarBuysIng = mallMemberStarBuyMapper.selectByStatusAndMemberId(1,memberId);
- //如果没有其他生效中的记录，则更新用户的星级
+ //如果没有其他生效中的记录，则更新用户的星级为普通,更新会员代理等级为代理
if(CollUtil.isEmpty(mallMemberStarBuysIng)){
mallMemberMapper.updateAccountLevelById(MemberAccountLevelEnum.NORMAL.getName(), memberId);
+
+ //如果代理等级为手动设置，则跳过该会员
+ int levelStatus = ObjectUtil.isEmpty(mallMember.getLevelStatus()) ? 0 : 1;
+ if(1 == levelStatus){
+ continue;
+ }
+ mallMemberMapper.updateLevelById(MemberAgentLevelEnum.AGENT.getName(),mallMember.getId());
}
}
}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/IApiMallOrderInfoService.java b/src/main/java/cc/mrbird/febs/mall/service/IApiMallOrderInfoService.java
index 91bd897..f43d1d3 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/IApiMallOrderInfoService.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/IApiMallOrderInfoService.java
@@ -35,4 +35,6 @@
void goodsComment(ApiAddCommentDtos addCommentDtos);
FebsResponse bangCardSign(BangCardSignDto bangCardSignDto);
+
+ FebsResponse subsidyAmountInfo();
}
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 9a2c5a5..3bc8606 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;
@@ -684,4 +681,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(yyyyMMddToday,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);
+ }
+
}
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/AdminMallMoneyFlowVo.java b/src/main/java/cc/mrbird/febs/mall/vo/AdminMallMoneyFlowVo.java
index 6b8270b..689ad52 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/AdminMallMoneyFlowVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/AdminMallMoneyFlowVo.java
@@ -25,4 +25,6 @@
private String remark;
+ private String memberName;
+
}
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/ApiMallSubsidyAmountInfoVo.java b/src/main/java/cc/mrbird/febs/mall/vo/ApiMallSubsidyAmountInfoVo.java
new file mode 100644
index 0000000..dac1ffa
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/mall/vo/ApiMallSubsidyAmountInfoVo.java
@@ -0,0 +1,28 @@
+package cc.mrbird.febs.mall.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+@ApiModel(value = "ApiMallSubsidyAmountInfoVo", description = "返回参数类")
+public class ApiMallSubsidyAmountInfoVo {
+
+ @ApiModelProperty(value = "获得总额")
+ private BigDecimal totalAmount = BigDecimal.ZERO;
+
+ @ApiModelProperty(value = "今日补贴")
+ private BigDecimal todayAmount = BigDecimal.ZERO;
+
+ @ApiModelProperty(value = "今日累计接单")
+ private Integer todayTotalCnt = 0;
+
+ @ApiModelProperty(value = "昨日补贴")
+ private BigDecimal yesterdayAmount = BigDecimal.ZERO;
+
+ @ApiModelProperty(value = "昨日累计接单")
+ private Integer totalYesterdayCnt = 0;
+
+}
diff --git a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
index 368a4e2..c2827e7 100644
--- a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
+++ b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
@@ -146,7 +146,12 @@
</select>
<select id="selectOrderMoneyFlowInPage" resultType="cc.mrbird.febs.mall.vo.AdminMallMoneyFlowVo">
- select * from mall_money_flow a where a.order_no = #{record.orderNo}
+ select
+ a.*,
+ b.name memberName
+ from mall_money_flow a
+ inner join mall_member b on b.id = a.rt_member_id
+ where a.order_no = #{record.orderNo}
order by a.CREATED_TIME desc
</select>
</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
index 38df6d1..c4419a6 100644
--- a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
+++ b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
@@ -112,6 +112,7 @@
<result column="del_flag" property="delFlag" />
<result column="deliver_type" property="deliverType" />
<result column="shop_id" property="shopId" />
+ <result column="subsidy_amount" property="subsidyAmount" />
<collection property="items" ofType="cc.mrbird.febs.mall.entity.MallOrderItem">
<id property="id" column="item_id" />
<result property="orderId" column="order_id" />
@@ -165,10 +166,10 @@
and a.order_type=#{record.orderType}
</if>
<if test="record.allStatus == 2">
- and a.status <![CDATA[<= ]]> 4
+ and a.status <![CDATA[< ]]> 4
</if>
<if test="record.allStatus == 3">
- and a.status <![CDATA[>= ]]> 5
+ and a.status <![CDATA[>= ]]> 4
</if>
</where>
order by a.created_time desc
@@ -321,7 +322,22 @@
count(a.id)
from mall_order_info a
where
- date_format(a.CREATED_TIME, '%Y-%m-%d') = #{createdTime}
+ <if test="createdTime != null">
+ and date_format(a.CREATED_TIME, '%Y-%m-%d') = #{createdTime}
+ </if>
+ and a.status = 4
+ and a.member_id = #{memberId}
+ </select>
+
+ <select id="selectTodayAmountByCreateTimeAndMemberId" resultType="java.math.BigDecimal">
+ select
+ ifnull(sum(a.subsidy_amount),0)
+ from mall_order_info a
+ where
+ <if test="createdTime != null">
+ and date_format(a.CREATED_TIME, '%Y-%m-%d') = #{createdTime}
+ </if>
+ and a.status = 4
and a.member_id = #{memberId}
</select>
</mapper>
\ No newline at end of file
diff --git a/src/main/resources/templates/febs/views/modules/order/orderMoneyFlow.html b/src/main/resources/templates/febs/views/modules/order/orderMoneyFlow.html
index 61c6c41..579c30e 100644
--- a/src/main/resources/templates/febs/views/modules/order/orderMoneyFlow.html
+++ b/src/main/resources/templates/febs/views/modules/order/orderMoneyFlow.html
@@ -16,26 +16,12 @@
febs = layui.febs,
form = layui.form,
table = layui.table,
- treeSelect = layui.treeSelect,
- dropdown = layui.dropdown,
$view = $('#febs-orderMoneyFlow-child'),
- $query = $view.find('#queryChild'),
- $searchForm = $view.find('formChild'),
- sortObject = {field: 'createTime', type: null},
- tableIns,
- createTimeFrom,
- createTimeTo;
+ tableIns;
form.render();
initTable();
-
- laydate.render({
- elem: '#user-createTime',
- range: true,
- trigger: 'click'
- });
-
function initTable() {
tableIns = febs.table.init({
@@ -43,6 +29,7 @@
id: 'orderMoneyFlowChild',
url: ctx + 'admin/order/moneyFlow?parentId=1',
cols: [[
+ {field: 'memberName', title: '用户名', minWidth: 80,align:'center'},
{field: 'amount', title: '金额', minWidth: 80,align:'center'},
{field: 'type', title: '流水类型',
templet: function (d) {
--
Gitblit v1.9.1