修改查询

src/main/java/com/sqx/modules/artificer/controller/app/AppArtificerController.java

@@ -637,4 +637,11 @@ public class AppArtificerController {
         return Result.success(map);
     }
 
+
+    @ApiOperation("技师获取积分列表")
+    @GetMapping("/getJifenList")
+    public Result getJifenList(Long userId,String startTime,String endTime){
+        return Result.success(artificerService.getJifenList(userId,startTime,endTime));
+    }
+
 }

src/main/java/com/sqx/modules/artificer/dao/OrdersDao.java

@@ -124,4 +124,12 @@ public interface OrdersDao extends BaseMapper<Orders> {
     IPage<Orders> getChongzhiList(Page<Orders> pages, Long userId, Integer isSfwc, String startTime, String endTime);
 
     String selectOrdersZxscNum(Long artificerId, String startTime, String endTime);
+
+    List<Orders> getYjjfList(Long userId, String startTime, String endTime);
+
+    List<Orders> getCzjfList(Long userId, String startTime, String endTime);
+
+    List<Orders> getDdczList(Long userId, String startTime, String endTime);
+
+    List<Orders> getZxscList(Long userId, String startTime, String endTime);
 }

src/main/java/com/sqx/modules/artificer/entity/Orders.java

@@ -432,6 +432,10 @@ public class Orders implements Serializable {
     @TableField(exist = false)
     private BigDecimal gjcePrice;
 
+    @TableField(exist = false)
+    private String jifen;
+    @TableField(exist = false)
+    private String jftime;
     @TableField(exist = false)
     private List<CouponUser> couponUserList;
 

src/main/java/com/sqx/modules/artificer/service/ArtificerService.java

@@ -41,4 +41,6 @@ public interface ArtificerService extends IService<Artificer> {
     Result getHomeArtificerList(Integer page, Integer limit, Integer isStart,Integer status, String city, String longitude, String latitude);
 
     Result getOrderTypeList(Long userId, Integer page, Integer limit, Integer orderType, Integer isSfwc,String startTime,String endTime);
+
+    Result getJifenList(Long userId, String startTime, String endTime);
 }

src/main/java/com/sqx/modules/artificer/service/impl/ArtificerServiceImpl.java

@@ -464,5 +464,46 @@ public class ArtificerServiceImpl extends ServiceImpl<ArtificerDao, Artificer> i
         return  Result.success(map);
     }
 
+    @Override
+    public Result getJifenList(Long userId, String startTime, String endTime) {
+        //1.获取业绩积分
+        List<Orders> yjjfList = ordersDao.getYjjfList(userId,startTime,endTime);
+        int yjjf = 0;
+        for (Orders par:yjjfList) {
+            yjjf += (int) Double.parseDouble(par.getJifen());
+        }
+        //2.获取储值积分（为他充值的）
+        List<Orders> czjfList = ordersDao.getCzjfList(userId,startTime,endTime);
+        int czjf = 0;
+        for (Orders par:czjfList) {
+            czjf += (int) Double.parseDouble(par.getJifen());
+        }
+        //3.获取订单充值积分
+        List<Orders> ddczList = ordersDao.getDdczList(userId,startTime,endTime);
+        int ddczjf = 0;
+        for (Orders par:ddczList) {
+            ddczjf += (int) Double.parseDouble(par.getJifen());
+        }
+        //4.获取在线时长积分
+        List<Orders> zxscList = ordersDao.getZxscList(userId,startTime,endTime);
+        int zxscjf = 0;
+        for (Orders par:zxscList) {
+            zxscjf += (int) Double.parseDouble(par.getJifen());
+        }
+        int sumJf = 0;
+        sumJf = yjjf + czjf + ddczjf + zxscjf;
+        Map<String,Object> map = new HashMap<String,Object>();
+        map.put("yjjfList",yjjfList);
+        map.put("yjjf",yjjf);
+        map.put("czjfList",czjfList);
+        map.put("czjf",czjf);
+        map.put("ddczList",ddczList);
+        map.put("ddczjf",ddczjf);
+        map.put("zxscList",zxscList);
+        map.put("zxscjf",zxscjf);
+        map.put("sumJf",sumJf);
+        return Result.success(map);
+    }
+
 
 }

src/main/resources/mapper/artificer/OrdersDao.xml

@@ -1049,6 +1049,35 @@
             and uu.type = 2
         </if>
     </select>
+    <!--    获取业绩积分-->
+    <select id="getYjjfList" resultType="com.sqx.modules.artificer.entity.Orders">
+        select *,price as jifen,end_times as jftime  from orders
+        where status in (3,5)
+        and artificer_id = ${userId}
+        and end_times BETWEEN #{startTime} and #{endTime}
+    </select>
+    <!--    获取储值积分（为他充值的）-->
+    <select id="getCzjfList" resultType="com.sqx.modules.artificer.entity.Orders">
+        select id,user_recharge as jifen,create_time as jftime from user_recharge
+        where type = 2 and orders_id is null
+        and artificer_id = ${userId}
+        and create_time BETWEEN #{startTime} and #{endTime}
+    </select>
+    <!--    获取订单充值积分-->
+    <select id="getDdczList" resultType="com.sqx.modules.artificer.entity.Orders">
+        select id,user_recharge as jifen,a.create_time as jftime,b.* from user_recharge a , orders b
+        where a.orders_id = b.orders_id and type = 2
+        and a.artificer_id =${userId}
+        and a.create_time BETWEEN #{startTime} and #{endTime}
+    </select>
+    <!--    获取在线时长积分-->
+    <select id="getZxscList" resultType="com.sqx.modules.artificer.entity.Orders">
+        select id,sum(user_recharge) as jifen,DATE_FORMAT(create_time,'%Y-%m-%d') as jftime from user_recharge
+        where type = 1
+        and artificer_id =${userId}
+        and create_time BETWEEN #{startTime} and #{endTime}
+        GROUP BY DATE_FORMAT(create_time,'%Y-%m-%d')
+    </select>