Merge branch 'master' of http://47.115.223.229:8888/yangjun/sadjv3_java

src/main/java/com/sqx/modules/app/controller/app/AppUserMoneyController.java

@@ -183,8 +183,8 @@ public class AppUserMoneyController {
 
         if(page == null){page = 1L;}
         if(limit == null){limit = 10L;}
-        IPage ipage = new Page(page, limit);
-        return userMoneyService.profitDetailed(artificer.getArtificerId(), ipage,startTime,endTime);
+        Page page1 = new Page(page, limit);
+        return userMoneyService.profitDetailed(artificer.getArtificerId(), page1,startTime,endTime);
     }
 
 

src/main/java/com/sqx/modules/app/service/UserMoneyService.java

@@ -26,6 +26,6 @@ public interface UserMoneyService extends IService<UserMoney> {
 
     PageUtils balanceDetailed(@RequestAttribute Long userId, Page<UserMoneyDetails> ipage);
 
-    Result profitDetailed(@RequestAttribute Long userId, IPage ipage, String startTime,String endTime);
+    Result profitDetailed(@RequestAttribute Long userId, Page ipage, String startTime,String endTime);
 
 }

src/main/java/com/sqx/modules/app/service/impl/UserMoneyServiceImpl.java

@@ -156,16 +156,19 @@ public class UserMoneyServiceImpl extends ServiceImpl<UserMoneyDao, UserMoney> i
     }
     //收益明细
     @Override
-    public Result profitDetailed(Long userId, IPage page1, String startTime,String endTime) {
-        QueryWrapper<Orders> queryWrapper = new QueryWrapper();
-        queryWrapper.eq("artificer_id", userId);
-        queryWrapper.between("end_times", startTime, endTime);
-        //只查询已完成和待评价的订单
-        queryWrapper.in("status", Arrays.asList(5, 3));
-        //只查询根节点数据
-        queryWrapper.eq("parent_id", 0);
-        queryWrapper.orderByDesc("end_times");
-        IPage<Orders> page2 =  ordersDao.selectPage(page1, queryWrapper);
+    public Result profitDetailed(Long userId, Page page, String startTime,String endTime) {
+//        QueryWrapper<Orders> queryWrapper = new QueryWrapper();
+//        queryWrapper.eq("artificer_id", userId);
+//        queryWrapper.between("end_times", startTime, endTime);
+//        //只查询已完成和待评价的订单
+//        queryWrapper.in("status", Arrays.asList(5, 3));
+//        //只查询根节点数据
+//        queryWrapper.eq("parent_id", 0);
+//        queryWrapper.orderByDesc("end_times");
+//        IPage<Orders> page2 =  ordersDao.selectPage(page1, queryWrapper);
+
+        IPage<Orders> page2 = ordersDao.selectDividedIntoDetails(page, userId,startTime,endTime,null);
+
         //分成明细添加到返回对象中
         return Result.success().put("data", page2);
     }

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

@@ -3162,8 +3162,11 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
     public Result cancelSupplementOrders(Long userId, Long ordersId, Integer isAuto, Integer type) {
         Orders orders = baseMapper.selectById(ordersId);
         //状态 1待支付 2待服务 3待评论 4已取消  5已完成  6进行中  7技师出发 8技师到达 9用户已支付技师待接单 10待补单
-        if(orders.getOldOrdersId()!=null && orders.getOldOrdersId() !=0 && type == 1){
-            return Result.error("补差价的单据无法生成待补单！");
+        if(!orders.getRefusalContent().equals("")){
+        }else{
+            if(orders.getOldOrdersId()!=null && orders.getOldOrdersId() !=0 && type == 1){
+                return Result.error("补差价的单据无法生成待补单！");
+            }
         }
         if (orders.getStatus() == 8 || orders.getStatus() == 9 || orders.getStatus() == 10 || orders.getStatus() == 11) {
             if(orders.getUserPackageDetailId() !=null){

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

@@ -1713,7 +1713,8 @@
     </select>
     <!--    获取储值积分（为他充值的）-->
     <select id="getCzjfList" resultType="com.sqx.modules.artificer.entity.Orders">
-        select id,user_recharge as jifen,create_time as jftime from user_recharge
+        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}