From 8aa9582001e46a9d621e1a6cdaafd52ee7500584 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期二, 04 七月 2023 16:34:35 +0800
Subject: [PATCH] 商户端其他统计
---
ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml | 11 ++
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/MerCouponPageDto.java | 2
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/order/Order.java | 6 +
ruoyi-modules/ruoyi-goods/src/main/resources/mapper/activity/ActivityMapper.xml | 9 ++
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/activity/ActivityServiceImpl.java | 12 +++
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/order/OrderService.java | 9 ++
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java | 35 ++++++--
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/management/MgtActivityController.java | 9 ++
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/activity/ActivityService.java | 14 ++-
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MerNewOrderDto.java | 3
ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/MemberMapper.xml | 4
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MgtActivityListVo.java | 23 +++++
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/business/MerMemberController.java | 8 --
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MerVerifyOrderDto.java | 2
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/order/OrderMapper.java | 9 ++
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerOrderController.java | 10 ++
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerTotalOrderVo.java | 32 ++++++++
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/activity/ActivityMapper.java | 9 ++
18 files changed, 180 insertions(+), 27 deletions(-)
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/management/MgtActivityController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/management/MgtActivityController.java
index 1e35cf5..81b5202 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/management/MgtActivityController.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/management/MgtActivityController.java
@@ -10,6 +10,7 @@
import com.ruoyi.goods.domain.dto.MgtActivityPageDto;
import com.ruoyi.goods.domain.dto.MgtActivityRecordPageDto;
import com.ruoyi.goods.domain.vo.MgtActivityGetVo;
+import com.ruoyi.goods.domain.vo.MgtActivityListVo;
import com.ruoyi.goods.domain.vo.MgtActivityPageVo;
import com.ruoyi.goods.domain.vo.MgtActivityRecordPageVo;
import com.ruoyi.goods.service.activity.ActivityService;
@@ -100,4 +101,12 @@
ExcelUtil<MgtActivityRecordPageVo> util = new ExcelUtil<MgtActivityRecordPageVo>(MgtActivityRecordPageVo.class);
util.exportExcel(response, activityRecordPageVoList, "商品列表");
}
+
+ @RequestMapping(value = "/listMgtActivity", method = RequestMethod.POST)
+ @ApiOperation(value = "获取活动列表")
+ public R<List<MgtActivityListVo>> listMgtActivity() {
+
+ List<MgtActivityListVo> activityListVoList = activityService.listMgtActivity();
+ return R.ok(activityListVoList);
+ }
}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MgtActivityListVo.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MgtActivityListVo.java
new file mode 100644
index 0000000..2cbb598
--- /dev/null
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MgtActivityListVo.java
@@ -0,0 +1,23 @@
+package com.ruoyi.goods.domain.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @ClassName MgtActivityListVo
+ * @Description TODO
+ * @Author jqs
+ * @Date 2023/7/4 15:28
+ * @Version 1.0
+ */
+@Data
+public class MgtActivityListVo {
+
+ @ApiModelProperty(value = "活动id")
+ private String activityId;
+
+ @ApiModelProperty(value = "活动名称")
+ private String activityName;
+
+
+}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/activity/ActivityMapper.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/activity/ActivityMapper.java
index 67d3554..fe7a0ee 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/activity/ActivityMapper.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/activity/ActivityMapper.java
@@ -6,6 +6,7 @@
import com.ruoyi.goods.domain.pojo.activity.Activity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.goods.domain.vo.MerActivityPageVo;
+import com.ruoyi.goods.domain.vo.MgtActivityListVo;
import com.ruoyi.goods.domain.vo.MgtActivityPageVo;
import com.ruoyi.goods.domain.vo.MgtActivityRecordPageVo;
import com.ruoyi.system.api.domain.dto.MerPageDto;
@@ -52,4 +53,12 @@
*/
List<MerActivityPageVo> pagePlatformMerActivity(Page page, @Param("param")MerPageDto merPageDto);
+ /**
+ * @description
+ * @author jqs
+ * @date 2023/7/4 15:36
+ * @param
+ * @return List<MgtActivityListVo>
+ */
+ List<MgtActivityListVo> listMgtActivity();
}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/activity/ActivityService.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/activity/ActivityService.java
index 0c9d5e0..4906958 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/activity/ActivityService.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/activity/ActivityService.java
@@ -6,10 +6,7 @@
import com.ruoyi.goods.domain.dto.MgtActivityPageDto;
import com.ruoyi.goods.domain.dto.MgtActivityRecordPageDto;
import com.ruoyi.goods.domain.pojo.activity.Activity;
-import com.ruoyi.goods.domain.vo.MerActivityPageVo;
-import com.ruoyi.goods.domain.vo.MgtActivityGetVo;
-import com.ruoyi.goods.domain.vo.MgtActivityPageVo;
-import com.ruoyi.goods.domain.vo.MgtActivityRecordPageVo;
+import com.ruoyi.goods.domain.vo.*;
import com.ruoyi.system.api.domain.dto.MerPageDto;
import java.util.List;
@@ -78,4 +75,13 @@
* @return List<MerActivityPageVo>
*/
List<MerActivityPageVo> pagePlatformMerActivity(Page page, MerPageDto merPageDto);
+
+ /**
+ * @description 获取活动列表
+ * @author jqs
+ * @date 2023/7/4 15:31
+ * @param
+ * @return List<MgtActivityListVo>
+ */
+ List<MgtActivityListVo> listMgtActivity();
}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/activity/ActivityServiceImpl.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/activity/ActivityServiceImpl.java
index 76e51e3..813eec9 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/activity/ActivityServiceImpl.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/activity/ActivityServiceImpl.java
@@ -266,4 +266,16 @@
List<MerActivityPageVo> activityPageVoList = activityMapper.pagePlatformMerActivity(page, merPageDto);
return activityPageVoList;
}
+
+ /**
+ * @description 获取活动列表
+ * @author jqs
+ * @date 2023/7/4 15:31
+ * @param
+ * @return List<MgtActivityListVo>
+ */
+ @Override
+ public List<MgtActivityListVo> listMgtActivity(){
+ return activityMapper.listMgtActivity();
+ }
}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/activity/ActivityMapper.xml b/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/activity/ActivityMapper.xml
index 89b2e8b..e284d9d 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/activity/ActivityMapper.xml
+++ b/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/activity/ActivityMapper.xml
@@ -93,4 +93,13 @@
group by ta.activity_id
ORDER BY ta.activity_status ASC,ta.create_time DESC
</select>
+
+ <select id="listMgtActivity" resultType="com.ruoyi.goods.domain.vo.MgtActivityListVo">
+ SELECT
+ ta.activity_id activityId,
+ ta.activity_name activityName
+ FROM t_activity ta
+ WHERE ta.del_flag = 0
+ ORDER BY ta.create_time DESC
+ </select>
</mapper>
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/business/MerMemberController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/business/MerMemberController.java
index 6b4ecc0..59bcc47 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/business/MerMemberController.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/business/MerMemberController.java
@@ -64,14 +64,6 @@
}
-
- /**
- * @description 获取会员信息
- * @author jqs
- * @date 2023/6/29 18:10
- * @param merBaseGetDto
- * @return R<MerMemberInfoVo>
- */
@RequestMapping(value = "/getMerMemberInfo", method = RequestMethod.POST)
@ApiOperation(value = "获取会员信息")
public R<MerMemberInfoVo> getMerMemberInfo(@RequestBody MerBaseGetDto merBaseGetDto) {
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/MerCouponPageDto.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/MerCouponPageDto.java
index 856b41a..0d199a4 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/MerCouponPageDto.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/MerCouponPageDto.java
@@ -15,7 +15,7 @@
public class MerCouponPageDto extends MerPageDto {
- @ApiModelProperty(name = "审核状态1申请中2审核通过3审核拒绝")
+ @ApiModelProperty(value = "审核状态1申请中2审核通过3审核拒绝")
private Integer auditStatus;
diff --git a/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/MemberMapper.xml b/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/MemberMapper.xml
index 9eae3c5..3622fae 100644
--- a/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/MemberMapper.xml
+++ b/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/MemberMapper.xml
@@ -156,7 +156,7 @@
tm.mobile mobile,
tm.referrer referrer,
0 recommendNum,
- 0 surpNum,
+ tmt.useable_service_count surpNum,
tm.birthday birthday,
tm.user_tags userTags,
tm.goods_type goodsType
@@ -257,7 +257,7 @@
AND tmt.last_pay_time = #{param.lastPayTime}
</if>
<if test="param.memberFlag != null and param.memberFlag != ''">
- AND tmt.binding_flag = #{param.memberFlag}
+ AND tm.binding_flag = #{param.memberFlag}
</if>
<if test="param.goodsType != null and param.goodsType != ''">
AND FIND_IN_SET(#{param.goodsType},tm.goods_type) > 0
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerOrderController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerOrderController.java
index 276fb0a..16f5118 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerOrderController.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerOrderController.java
@@ -8,6 +8,7 @@
import com.ruoyi.order.domain.vo.*;
import com.ruoyi.order.service.order.OrderService;
import com.ruoyi.system.api.constant.AppErrorConstant;
+import com.ruoyi.system.api.domain.dto.MerBaseDto;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.RequestBody;
@@ -128,6 +129,15 @@
return R.ok(page.setRecords(merOrderPageVoList));
}
+ @RequestMapping(value = "/totalMerOrder", method = RequestMethod.POST)
+ @ApiOperation(value = "商户端订单管理统计")
+ public R<MerTotalOrderVo> totalMerOrder(@RequestBody MerBaseDto merBaseDto) {
+ Long userId = SecurityUtils.getUserId();
+ merBaseDto.setUserId(userId);
+ MerTotalOrderVo totalOrderVo = orderService.totalMerOrder(merBaseDto);
+ return R.ok(totalOrderVo);
+ }
+
@RequestMapping(value = "/pageMerMemberOrder", method = RequestMethod.POST)
@ApiOperation(value = "分页商户端用户收银记录")
public R<Page<MerMemberNoClearOrderVo>> pageMerMemberOrder(@RequestBody MerMemberNoClearOrderDto merMemberNoClearOrderDto) {
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MerNewOrderDto.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MerNewOrderDto.java
index 2416d5b..e447fae 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MerNewOrderDto.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MerNewOrderDto.java
@@ -32,6 +32,9 @@
@ApiModelProperty(value = "支付金额")
private BigDecimal payMoney;
+ @ApiModelProperty(value = "改变金额")
+ private BigDecimal changeMoney;
+
@ApiModelProperty(value = "支付方式")
private Integer payType;
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MerVerifyOrderDto.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MerVerifyOrderDto.java
index afc33b3..eb78000 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MerVerifyOrderDto.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MerVerifyOrderDto.java
@@ -22,6 +22,6 @@
@ApiModelProperty(value = "实收金额")
private BigDecimal relReceiveMoney;
- @ApiModelProperty(value = "实收金额")
+ @ApiModelProperty(value = "实付金额")
private BigDecimal relPayMoney;
}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/order/Order.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/order/Order.java
index a2912c3..989adcd 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/order/Order.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/order/Order.java
@@ -173,6 +173,12 @@
@TableField("activity_name")
private String activityName;
+ /**
+ * 应收金额
+ */
+ @TableField("change_receivable_money")
+ private BigDecimal changeReceivableMoney;
+
@Override
protected Serializable pkVal() {
return this.orderId;
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerTotalOrderVo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerTotalOrderVo.java
new file mode 100644
index 0000000..06d6012
--- /dev/null
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerTotalOrderVo.java
@@ -0,0 +1,32 @@
+package com.ruoyi.order.domain.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @ClassName MerTotalOrderVo
+ * @Description TODO
+ * @Author jqs
+ * @Date 2023/7/4 15:59
+ * @Version 1.0
+ */
+@Data
+public class MerTotalOrderVo {
+
+ @ApiModelProperty(value = "总订单数")
+ private Integer orderTotal;
+
+ @ApiModelProperty(value = "应收金额")
+ private BigDecimal receivableMoney;
+
+ @ApiModelProperty(value = "实收金额")
+ private BigDecimal relReceiveMoney;
+
+ @ApiModelProperty(value = "实付金额")
+ private BigDecimal relPayMoney;
+
+ @ApiModelProperty(value = "未收金额")
+ private BigDecimal unpaidMoney;
+}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/order/OrderMapper.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/order/OrderMapper.java
index 381016b..f848589 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/order/OrderMapper.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/order/OrderMapper.java
@@ -485,4 +485,13 @@
* @date 2023/6/19 22:48
*/
List<MgtMapBigTotalVo> listMerOrderTotalOrderFrom(@Param("param")MerTotalDto merTotalDto);
+
+ /**
+ * @description 商户端订单管理统计
+ * @author jqs
+ * @date 2023/7/4 16:27
+ * @param shopId
+ * @return MerTotalOrderVo
+ */
+ MerTotalOrderVo totalMerOrder(@Param("shopId")Long shopId);
}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
index ec6cfb0..9c6b785 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
@@ -354,7 +354,7 @@
order.setOrderId(orderId);
order.setDelFlag(0);
//为对接支付 直接付款成功
- order.setOrderStatus(2);
+ order.setOrderStatus(1);
order.setOrderNo(orderNo);
order.setOrderFrom(1);
order.setShopId(appPlaceOrderDto.getShopId());
@@ -364,6 +364,7 @@
order.setDiscountMoney(couponDiscount);
order.setReceivableMoney(orderPayMoney);
order.setReceivableDeposit(orderPayDeposit);
+ order.setChangeReceivableMoney(orderPayMoney);
order.setPayType(appPlaceOrderDto.getPayType());
if (order.getPayType() == 1) {
order.setPayMoney(orderPayMoney);
@@ -578,8 +579,9 @@
order.setUseUserId(merVerifyOrderDto.getUserId());
order.setOfflinePayMoney(relPayMoney);
order.setOffPayTime(nowTime);
- order.setPayMoney(relReceiveMoney.add(relPayMoney));
+ order.setPayMoney(order.getPayMoney().add(relPayMoney));
order.setCloseFlag(1);
+ order.setChangeReceivableMoney(relReceiveMoney);
this.saveOrUpdate(order);
//创建服务商品
List<AppUserOrderGoodsPageVo> appUserOrderGoodsPageVoList = orderGoodsService.listAppVoByOrderId(orderId);
@@ -853,7 +855,6 @@
if (null != appMemberCouponVoList) {
appMemberCouponVoMap = appMemberCouponVoList.stream().collect(Collectors.toMap(AppMemberCouponVo::getMemberCouponId, Function.identity()));
}
-
AppMemberCouponVo appMemberCouponVo;
Integer couponType;
BigDecimal moneyThreshold;
@@ -972,15 +973,15 @@
order.setReceivableMoney(orderPayMoney);
order.setReceivableDeposit(new BigDecimal("0.00"));
order.setPayType(1);
- if (order.getPayType() == 1) {
- order.setPayMoney(orderPayMoney);
- order.setOnlinePayMoney(orderPayMoney);
- order.setCloseFlag(1);
- } else if (order.getPayType() == 2) {
- order.setPayMoney(orderPayDeposit);
- order.setOnlinePayMoney(orderPayDeposit);
- order.setCloseFlag(0);
+ if(merNewOrderDto.getChangeMoney()!=null){
+ order.setChangeReceivableMoney(merNewOrderDto.getChangeMoney());
+ }else{
+ order.setChangeReceivableMoney(orderPayMoney);
}
+ order.setPayMoney(orderPayMoney);
+ order.setOnlinePayMoney(new BigDecimal("0.00"));
+ order.setOfflinePayMoney(orderPayMoney);
+ order.setCloseFlag(1);
order.setOrderRemark(merNewOrderDto.getOrderRemark());
order.setGoodsNum(goodsNum);
order.setCreateTime(nowTime);
@@ -2230,4 +2231,16 @@
}
return merOrderFromRankVo;
}
+
+ /**
+ * @description 商户端订单管理统计
+ * @author jqs
+ * @date 2023/7/4 16:27
+ * @param merBaseDto
+ * @return MerTotalOrderVo
+ */
+ @Override
+ public MerTotalOrderVo totalMerOrder(MerBaseDto merBaseDto){
+ return orderMapper.totalMerOrder(merBaseDto.getShopId());
+ }
}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/order/OrderService.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/order/OrderService.java
index 8aedab4..978f2b2 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/order/OrderService.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/order/OrderService.java
@@ -341,4 +341,13 @@
* @return MerOrderFromRankVo
*/
MerOrderFromRankVo getMerOrderFromRank(MerTotalDto merTotalDto);
+
+ /**
+ * @description 商户端订单管理统计
+ * @author jqs
+ * @date 2023/7/4 16:27
+ * @param merBaseDto
+ * @return MerTotalOrderVo
+ */
+ MerTotalOrderVo totalMerOrder(MerBaseDto merBaseDto);
}
diff --git a/ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml b/ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml
index 9745845..4ccd213 100644
--- a/ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml
+++ b/ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml
@@ -1352,4 +1352,15 @@
GROUP BY toc.order_from
ORDER BY SUM(toc.order_money) DESC LIMIT 15
</select>
+
+ <select id="totalMerOrder" resultType="com.ruoyi.order.domain.vo.MerTotalOrderVo">
+ SELECT
+ COUNT(order_id) orderTotal,
+ IFNULL(SUM(receivable_money),0) receivableMoney,
+ IFNULL(SUM(change_receivable_money),0) relReceiveMoney,
+ IFNULL(SUM(pay_money),0) relPayMoney,
+ IFNULL(SUM(receivable_money-IFNULL(pay_money,0)),0) unpaidMoney
+ FROM t_order
+ WHERE del_flag = 0 AND shop_id = #{shopId}
+ </select>
</mapper>
--
Gitblit v1.7.1