fix

netflix-dao/src/main/java/com/cyksj/mapper/shop/YhShopDistributeWaitingSendPointsMapper.java

@@ -1,13 +1,22 @@
 package com.cyksj.mapper.shop;
 
+import cn.hutool.core.date.DateTime;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.cyksj.model.entity.YhShopDistributeWaitingSendPoints;
+import com.cyksj.model.views.YhShopBrokenLineCpsUserWMoneyView;
+import com.cyksj.model.views.YhShopUserWMoneyStatisticsDataView;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /*
  *项目名: yhlxj
  *文件名: YhShopDistributeWaitingSendPointsMapper
  *创建者: JavaZou
- *创建时间:2023/9/14 16:58
+ *创建时间:2023/9/19 18:08
  */
 public interface YhShopDistributeWaitingSendPointsMapper extends BaseMapper<YhShopDistributeWaitingSendPoints> {
+	YhShopBrokenLineCpsUserWMoneyView getWMoneyStatisticsDataView(@Param("yhShopUserId") long yhShopUserId, @Param("first") DateTime first, @Param("end") DateTime end, @Param("today") Boolean today);
+
+	List<YhShopUserWMoneyStatisticsDataView> getWMoneyStatisticsDate(@Param("yhShopUserId") long yhShopUserId, @Param("first") DateTime first, @Param("end") DateTime end, @Param("today") Boolean today);
 }

netflix-dao/src/main/java/com/cyksj/mapper/shop/YhShopWaitingSendPointsMapper.java

@@ -1,21 +0,0 @@
-package com.cyksj.mapper.shop;
-
-import cn.hutool.core.date.DateTime;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.cyksj.model.views.YhShopBrokenLineCpsUserWMoneyView;
-import com.cyksj.model.views.YhShopUserWMoneyStatisticsDataView;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/*
- *项目名: yhlxj
- *文件名: YhShopWaitingSendPointsMapper
- *创建者: JavaZou
- *创建时间:2023/9/19 18:08
- */
-public interface YhShopWaitingSendPointsMapper extends BaseMapper<YhShopWaitingSendPointsMapper> {
-	YhShopBrokenLineCpsUserWMoneyView getWMoneyStatisticsDataView(@Param("yhShopUserId") long yhShopUserId, @Param("first") DateTime first, @Param("end") DateTime end, @Param("today") Boolean today);
-
-	List<YhShopUserWMoneyStatisticsDataView> getWMoneyStatisticsDate(@Param("yhShopUserId") long yhShopUserId, @Param("first") DateTime first, @Param("end") DateTime end, @Param("today") Boolean today);
-}

netflix-dao/src/main/resources/YhShopWaitingSendPointsMapper.xml → netflix-dao/src/main/resources/mapper/YhShopWaitingSendPointsMapper.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.cyksj.mapper.shop.YhShopWaitingSendPointsMapper">
+<mapper namespace="com.cyksj.mapper.shop.YhShopDistributeWaitingSendPointsMapper">
 
-    <select id="getWMoneyStatisticsDataView"
+<select id="getWMoneyStatisticsDataView"
             resultType="com.cyksj.model.views.YhShopBrokenLineCpsUserWMoneyView">
         select
         <if test="today">
@@ -11,7 +11,7 @@
         <if test="!today">
             date_format(send_time, '%Y-%m-%d') `date`,
         </if>
-        TRUNCATE(ifnull(sum(points),0)/ 1000,2) money
+        TRUNCATE(sum(money)/ 100,2) money
         from `yh_shop_distribute_waiting_send_points`
         where shop_user_id = #{yhShopUserId}
         and send_status = 'waiting'

netflix-service/src/main/java/com/cyksj/service/cps/shop/YhShopManageServiceImpl.java

@@ -16,7 +16,7 @@ import com.cyksj.enums.GatewayResponse;
 import com.cyksj.mapper.UserMapper;
 import com.cyksj.mapper.shop.YhShopDistributeMoneyApplyMapper;
 import com.cyksj.mapper.shop.YhShopMapper;
-import com.cyksj.mapper.shop.YhShopWaitingSendPointsMapper;
+import com.cyksj.mapper.shop.YhShopDistributeWaitingSendPointsMapper;
 import com.cyksj.model.entity.User;
 import com.cyksj.model.entity.YhShop;
 import com.cyksj.model.entity.YhShopDistributeMoneyApply;
@@ -57,7 +57,7 @@ public class YhShopManageServiceImpl implements YhShopManageService{
 
 	private final UserBenefitsService userBenefitsService;
 
-	private final YhShopWaitingSendPointsMapper yhShopWaitingSendPointsMapper;
+	private final YhShopDistributeWaitingSendPointsMapper yhShopDistributeWaitingSendPointsMapper;
 
 	private final YhShopDistributeMoneyApplyMapper yhShopDistributeMoneyApplyMapper;
 
@@ -155,13 +155,13 @@ public class YhShopManageServiceImpl implements YhShopManageService{
 	@Override
 	public YhShopBrokenLineCpsUserWMoneyView getWMoneyStatisticsDate(long yhShopUserId, DateTime first, DateTime end) {
 		boolean today = isToday(first, end);
-		return yhShopWaitingSendPointsMapper.getWMoneyStatisticsDataView(yhShopUserId, first, end, today);
+		return yhShopDistributeWaitingSendPointsMapper.getWMoneyStatisticsDataView(yhShopUserId, first, end, today);
 	}
 
 	@Override
 	public List<YhShopUserWMoneyStatisticsDataView> getWMoneyStatisticsDataView(long yhShopUserId, DateTime first, DateTime end) {
 		boolean today = isToday(first, end);
-		return yhShopWaitingSendPointsMapper.getWMoneyStatisticsDate(yhShopUserId, first, end, today);
+		return yhShopDistributeWaitingSendPointsMapper.getWMoneyStatisticsDate(yhShopUserId, first, end, today);
 	}
 
 	@Override