BUG调整

src/main/java/com/sqx/modules/artificer/controller/ArtificerController.java

@@ -230,6 +230,12 @@ public class ArtificerController {
         return ordersService.cancelOrders(null,ordersId);
     }
 
+    @PostMapping("/cancelOrdersByPc")
+    @ApiOperation("PC端取消订单")
+    public Result cancelOrdersByPc(Long ordersId){
+        return ordersService.cancelOrdersByPc(null,ordersId);
+    }
+
     @PostMapping("/cancelSupplementOrders")
     @ApiOperation("待补单处理及待补单全单退款")
     public Result cancelSupplementOrders(Long ordersId,Integer isAuto,Integer type){

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

@@ -22,6 +22,8 @@ public interface OrdersService extends IService<Orders> {
 
     Result cancelOrders(Long userId,Long ordersId);
 
+    Result cancelOrdersByPc(Long userId,Long ordersId);
+
     Result cancelSupplementOrders(Long userId, Long ordersId, Integer isAuto, Integer type);
 
     Result removeOrders(Long ordersId);

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

@@ -2665,6 +2665,55 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
         return Result.success().put("data",remarks);
     }
 
+    @Override
+    @Transactional
+    public Result cancelOrdersByPc(Long userId, Long ordersId) {
+        Orders orders = baseMapper.selectById(ordersId);
+        //状态 1待支付 2待服务 3待评论 4已取消  5已完成  6进行中  7技师出发 8技师到达 9用户已支付技师待接单 10待补单
+        if (orders.getStatus() == 4) {
+            return Result.error("订单已经取消了！");
+        } else if (orders.getStatus() == 3 || orders.getStatus() == 5) {
+            return Result.error("订单已经完成了，无法取消！");
+        }
+        artificerTimeService.remove(new QueryWrapper<ArtificerTime>().eq("orders_id", orders.getOrdersId()));
+        if(orders.getUserPackageDetailId() !=null){
+            //释放套餐
+            UserPackageDetail userPackageDetail = new UserPackageDetail();
+            userPackageDetail.setId(orders.getUserPackageDetailId());
+            userPackageDetail.setStatus(0);
+            userPackageDetailService.updateById(userPackageDetail);
+        }else{
+            //释放代金券
+            String couponIds = orders.getCouponId();
+            if(orders.getCouponId() != null && couponIds.length()>0){
+                String[] couponArr = couponIds.trim().split(",");
+                for(int i=0;i<couponArr.length;i++){
+                    if(couponArr[i]!=null && !couponArr[i].equals("")){
+                        Long couponId = Long.valueOf(couponArr[i]);
+                        CouponUser couponUser = couponUserService.getById(couponId);
+                        couponUser.setStatus(0);
+                        couponUserService.updateById(couponUser);
+                    }
+                }
+            }
+        }
+        orders.setStatus(4);
+        //加钟
+        List<Orders> ordersList = baseMapper.selectList(new QueryWrapper<Orders>().isNotNull("pay_way").eq("parent_id", orders.getOrdersId()));
+        for (Orders orders1 : ordersList) {
+            orders1.setStatus(4);
+            baseMapper.updateById(orders1);
+        }
+        if(orders.getOldOrdersId()!=null && orders.getOldOrdersId() !=0){
+            Orders ordersOld = new Orders();
+            ordersOld.setOrdersId(orders.getOldOrdersId());
+            ordersOld.setStatus(4);
+            baseMapper.updateById(ordersOld);
+        }
+        baseMapper.updateById(orders);
+        return Result.success();
+    }
+
     @Override
     @Transactional
     public Result cancelOrders(Long userId, Long ordersId) {
@@ -4578,15 +4627,19 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
         if (orders.getStatus() == 4) {
             return Result.error("订单已经取消了！");
         }
-        artificerTimeService.remove(new QueryWrapper<ArtificerTime>().eq("orders_id", ordersId));
+        String couponIds = orders.getCouponId();
-
+        if(orders.getCouponId() != null && couponIds.length()>0){
-        if (orders.getCouponId() != null) {
+            String[] couponArr = couponIds.trim().split(",");
-            CouponUser couponUser = couponUserService.getById(orders.getCouponId());
+            for(int i=0;i<couponArr.length;i++){
-            if (couponUser != null && couponUser.getStatus().equals(1)) {
+                if(couponArr[i]!=null && !couponArr[i].equals("")){
-                couponUser.setStatus(0);
+                    Long couponId = Long.valueOf(couponArr[i]);
-                couponUserService.updateById(couponUser);
+                    CouponUser couponUser = couponUserService.getById(couponId);
+                    couponUser.setStatus(0);
+                    couponUserService.updateById(couponUser);
+                }
             }
         }
+        artificerTimeService.remove(new QueryWrapper<ArtificerTime>().eq("orders_id", ordersId));
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         String time = simpleDateFormat.format(new Date());
         BigDecimal refundMoneys = BigDecimal.ZERO;
@@ -4599,39 +4652,51 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
             refundMoneys = refundMoney.subtract(orders.getPayMoney());
         }
 
-
+        UserMoneyDetails userMoneyDetails = new UserMoneyDetails();
         if (orders.getPayWay() == 1 || orders.getPayWay() == 2 || orders.getPayWay() == 3 || orders.getPayWay() == 4) {
-            boolean refund = wxService.refund(orders.getOrdersNo(), orders.getPayMoney(), refundMoney, orders.getPayWay());
+            if(refundMoney.compareTo(BigDecimal.ZERO) > 0) {
-            if (!refund) {
+                boolean refund = wxService.refund(orders.getOrdersNo(), orders.getPayMoney(), refundMoney, orders.getPayWay());
-                return Result.error("退款失败，请联系客服！");
+                if (!refund) {
-            }
+                    return Result.error("退款失败，请联系客服！");
-        } else if (orders.getPayWay() == 6) {
-            String data = aliPayController.alipayRefund(orders.getOrdersNo(), refundMoney);
-            if (StringUtils.isNotBlank(data)) {
-                log.error(data);
-                JSONObject jsonObject = JSON.parseObject(data);
-                JSONObject alipay_trade_refund_response = jsonObject.getJSONObject("alipay_trade_refund_response");
-                String code1 = alipay_trade_refund_response.getString("code");
-                if (!"10000".equals(code1)) {
-                    return Result.error("退款失败！" + alipay_trade_refund_response.getString("sub_msg"));
                 }
-            } else {
-                return Result.error("退款失败！");
             }
+            userMoneyDetails.setManipulateType(1);
+            userMoneyDetails.setBlFlag(2);
+        } else if (orders.getPayWay() == 6) {
+            if(refundMoney.compareTo(BigDecimal.ZERO) > 0) {
+                String data = aliPayController.alipayRefund(orders.getOrdersNo(), refundMoney);
+                if (StringUtils.isNotBlank(data)) {
+                    log.error(data);
+                    JSONObject jsonObject = JSON.parseObject(data);
+                    JSONObject alipay_trade_refund_response = jsonObject.getJSONObject("alipay_trade_refund_response");
+                    String code1 = alipay_trade_refund_response.getString("code");
+                    if (!"10000".equals(code1)) {
+                        return Result.error("退款失败！" + alipay_trade_refund_response.getString("sub_msg"));
+                    }
+                } else {
+                    return Result.error("退款失败！");
+                }
+            }
+            userMoneyDetails.setManipulateType(1);
+            userMoneyDetails.setBlFlag(2);
         } else {
-            if (orders.getUserArtificerMoney() != null && orders.getUserArtificerMoney() == 1) {
+//            if (orders.getUserArtificerMoney() != null && orders.getUserArtificerMoney() == 1) {
-                userMoneyArtificerService.updateMoney(1, orders.getUserId(), orders.getArtificerId(), refundMoney.doubleValue());
+//                userMoneyArtificerService.updateMoney(1, orders.getUserId(), orders.getArtificerId(), refundMoney.doubleValue());
-            } else {
+//            } else {
+//                userMoneyService.updateMoney(1, orders.getUserId(), refundMoney.doubleValue());
+//            }
+            if(refundMoney.compareTo(BigDecimal.ZERO) > 0) {
                 userMoneyService.updateMoney(1, orders.getUserId(), refundMoney.doubleValue());
             }
+            //查询用户当前余额
+            UserMoney userNowMoney = userMoneyService.selectUserMoneyByUserId(orders.getUserId());
+            //插入余额
+            userMoneyDetails.setBalance(userNowMoney.getMoney());
+            //插入操作类型为已操作用户余额
+            userMoneyDetails.setManipulateType(2);
+            userMoneyDetails.setBlFlag(1);
         }
-        UserMoneyDetails userMoneyDetails = new UserMoneyDetails();
+
-        //查询用户当前余额
-        UserMoney userNowMoney1 = userMoneyService.selectUserMoneyByUserId(orders.getUserId());
-        //插入余额
-        userMoneyDetails.setBalance(userNowMoney1.getMoney());
-        //插入操作类型为已操作用户余额
-        userMoneyDetails.setManipulateType(2);
         userMoneyDetails.setMoney(refundMoney);
         userMoneyDetails.setUserId(orders.getUserId());
         userMoneyDetails.setContent("订单号：" + orders.getOrdersNo() + ",已原路退款！");
@@ -4640,11 +4705,13 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
         userMoneyDetails.setState(2);
         userMoneyDetails.setCreateTime(time);
         userMoneyDetails.setArtificerId(orders.getArtificerId());
+        userMoneyDetails.setBlRole(1);
         userMoneyDetailsService.save(userMoneyDetails);
 
         if (refundMoneys.doubleValue() > 0) {
             List<Orders> ordersList = baseMapper.selectList(new QueryWrapper<Orders>().isNotNull("pay_way").eq("parent_id", orders.getOrdersId()));
             for (Orders orders1 : ordersList) {
+                userMoneyDetails = new UserMoneyDetails();
                 BigDecimal refundMoney1 = BigDecimal.ZERO;
                 if (orders1.getPayMoney().doubleValue() < refundMoneys.doubleValue()) {
                     refundMoneys = refundMoneys.subtract(orders1.getPayMoney());
@@ -4655,37 +4722,49 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
                 }
 
                 if (orders1.getPayWay() == 1 || orders1.getPayWay() == 2 || orders1.getPayWay() == 3 || orders1.getPayWay() == 4) {
-                    boolean refund = wxService.refund(orders1.getOrdersNo(), orders1.getPayMoney(), refundMoney1, orders1.getPayWay());
+                    if(refundMoney1.compareTo(BigDecimal.ZERO) > 0) {
-                    if (!refund) {
+                        boolean refund = wxService.refund(orders1.getOrdersNo(), orders1.getPayMoney(), refundMoney1, orders1.getPayWay());
-                        return Result.error("退款失败，请联系客服！");
+                        if (!refund) {
-                    }
+                            return Result.error("退款失败，请联系客服！");
-                } else if (orders1.getPayWay() == 6) {
-                    String data = aliPayController.alipayRefund(orders1.getOrdersNo(), refundMoney1);
-                    if (StringUtils.isNotBlank(data)) {
-                        log.error(data);
-                        JSONObject jsonObject = JSON.parseObject(data);
-                        JSONObject alipay_trade_refund_response = jsonObject.getJSONObject("alipay_trade_refund_response");
-                        String code1 = alipay_trade_refund_response.getString("code");
-                        if (!"10000".equals(code1)) {
-                            return Result.error("退款失败！" + alipay_trade_refund_response.getString("sub_msg"));
                         }
-                    } else {
-                        return Result.error("退款失败！");
                     }
+                    userMoneyDetails.setManipulateType(1);
+                    userMoneyDetails.setBlFlag(2);
+                } else if (orders1.getPayWay() == 6) {
+                    if(refundMoney1.compareTo(BigDecimal.ZERO) > 0) {
+                        String data = aliPayController.alipayRefund(orders1.getOrdersNo(), refundMoney1);
+                        if (StringUtils.isNotBlank(data)) {
+                            log.error(data);
+                            JSONObject jsonObject = JSON.parseObject(data);
+                            JSONObject alipay_trade_refund_response = jsonObject.getJSONObject("alipay_trade_refund_response");
+                            String code1 = alipay_trade_refund_response.getString("code");
+                            if (!"10000".equals(code1)) {
+                                return Result.error("退款失败！" + alipay_trade_refund_response.getString("sub_msg"));
+                            }
+                        } else {
+                            return Result.error("退款失败！");
+                        }
+                    }
+                    userMoneyDetails.setManipulateType(1);
+                    userMoneyDetails.setBlFlag(2);
                 } else {
-                    if (orders1.getUserArtificerMoney() != null && orders1.getUserArtificerMoney() == 1) {
+//                    if (orders1.getUserArtificerMoney() != null && orders1.getUserArtificerMoney() == 1) {
-                        userMoneyArtificerService.updateMoney(1, orders1.getUserId(), orders1.getArtificerId(), refundMoney1.doubleValue());
+//                        userMoneyArtificerService.updateMoney(1, orders1.getUserId(), orders1.getArtificerId(), refundMoney1.doubleValue());
-                    } else {
+//                    } else {
+//                        userMoneyService.updateMoney(1, orders1.getUserId(), refundMoney1.doubleValue());
+//                    }
+                    if(refundMoney1.compareTo(BigDecimal.ZERO) > 0) {
                         userMoneyService.updateMoney(1, orders1.getUserId(), refundMoney1.doubleValue());
                     }
+                    //查询用户当前余额
+                    UserMoney userNowMoney = userMoneyService.selectUserMoneyByUserId(orders1.getUserId());
+                    //插入余额
+                    userMoneyDetails.setBalance(userNowMoney.getMoney());
+                    //插入操作类型为已操作用户余额
+                    userMoneyDetails.setManipulateType(2);
+                    userMoneyDetails.setBlFlag(1);
                 }
-                userMoneyDetails = new UserMoneyDetails();
+
-                //查询用户当前余额
-                UserMoney userNowMoney8 = userMoneyService.selectUserMoneyByUserId(orders1.getUserId());
-                //插入余额
-                userMoneyDetails.setBalance(userNowMoney8.getMoney());
-                //插入操作类型为已操作用户余额
-                userMoneyDetails.setManipulateType(2);
                 userMoneyDetails.setMoney(refundMoney1);
                 userMoneyDetails.setUserId(orders1.getUserId());
                 userMoneyDetails.setContent("订单号：" + orders1.getOrdersNo() + ",已原路退款！");
@@ -4694,7 +4773,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
                 userMoneyDetails.setState(2);
                 userMoneyDetails.setCreateTime(time);
                 userMoneyDetails.setArtificerId(orders.getArtificerId());
-
+                userMoneyDetails.setBlRole(1);
                 userMoneyDetailsService.save(userMoneyDetails);
                 orders1.setStatus(4);
                 baseMapper.updateById(orders1);
@@ -7331,11 +7410,16 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
     @Override
     public Result refundOrders(Long ordersId) {
         Orders orders = baseMapper.selectById(ordersId);
-        if (orders.getCouponId() != null) {
+        String couponIds = orders.getCouponId();
-            CouponUser couponUser = couponUserService.getById(orders.getCouponId());
+        if(orders.getCouponId() != null && couponIds.length()>0){
-            if (couponUser != null && couponUser.getStatus().equals(1)) {
+            String[] couponArr = couponIds.trim().split(",");
-                couponUser.setStatus(0);
+            for(int i=0;i<couponArr.length;i++){
-                couponUserService.updateById(couponUser);
+                if(couponArr[i]!=null && !couponArr[i].equals("")){
+                    Long couponId = Long.valueOf(couponArr[i]);
+                    CouponUser couponUser = couponUserService.getById(couponId);
+                    couponUser.setStatus(0);
+                    couponUserService.updateById(couponUser);
+                }
             }
         }
         artificerTimeService.remove(new QueryWrapper<ArtificerTime>().eq("orders_id", ordersId));
@@ -7343,58 +7427,19 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
             SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             String time = simpleDateFormat.format(new Date());
             List<Orders> ordersList = baseMapper.selectList(new QueryWrapper<Orders>().isNotNull("pay_way").eq("parent_id", orders.getOrdersId()));
-            if (orders.getPayWay() == 1 || orders.getPayWay() == 2 || orders.getPayWay() == 3 || orders.getPayWay() == 4) {
-                boolean refund = wxService.refund(orders.getOrdersNo(), orders.getPayMoney(), orders.getPayMoney(), orders.getPayWay());
-                if (!refund) {
-                    return Result.error("退款失败，请联系客服！");
-                }
-            } else if (orders.getPayWay() == 6) {
-                String data = aliPayController.alipayRefund(orders.getOrdersNo(), orders.getPayMoney());
-                if (StringUtils.isNotBlank(data)) {
-                    log.error(data);
-                    JSONObject jsonObject = JSON.parseObject(data);
-                    JSONObject alipay_trade_refund_response = jsonObject.getJSONObject("alipay_trade_refund_response");
-                    String code1 = alipay_trade_refund_response.getString("code");
-                    if (!"10000".equals(code1)) {
-                        return Result.error("退款失败！" + alipay_trade_refund_response.getString("sub_msg"));
-                    }
-                } else {
-                    return Result.error("退款失败！");
-                }
-            } else {
-                if (orders.getUserArtificerMoney() != null && orders.getUserArtificerMoney() == 1) {
-                    userMoneyArtificerService.updateMoney(1, orders.getUserId(), orders.getArtificerId(), orders.getPayMoney().doubleValue());
-                } else {
-                    userMoneyService.updateMoney(1, orders.getUserId(), orders.getPayMoney().doubleValue());
-                }
-
-            }
             UserMoneyDetails userMoneyDetails = new UserMoneyDetails();
-            //查询用户当前余额
+            if (orders.getPayWay() == 1 || orders.getPayWay() == 2 || orders.getPayWay() == 3 || orders.getPayWay() == 4) {
-            UserMoney userNowMoney = userMoneyService.selectUserMoneyByUserId(orders.getUserId());
+                if(orders.getPayMoney().compareTo(BigDecimal.ZERO) > 0) {
-            //插入余额
+                    boolean refund = wxService.refund(orders.getOrdersNo(), orders.getPayMoney(), orders.getPayMoney(), orders.getPayWay());
-            userMoneyDetails.setBalance(userNowMoney.getMoney());
-            //插入操作类型为已操作用户余额
-            userMoneyDetails.setManipulateType(2);
-            userMoneyDetails.setMoney(orders.getPayMoney());
-            userMoneyDetails.setUserId(orders.getUserId());
-            userMoneyDetails.setContent("订单号：" + orders.getOrdersNo() + ",已原路退款！");
-            userMoneyDetails.setTitle("订单退款");
-            userMoneyDetails.setType(1);
-            userMoneyDetails.setState(2);
-            userMoneyDetails.setCreateTime(time);
-            userMoneyDetails.setArtificerId(orders.getArtificerId());
-            userMoneyDetails.setBlRole(1);
-            userMoneyDetails.setBlFlag(1);
-            userMoneyDetailsService.save(userMoneyDetails);
-            for (Orders orders1 : ordersList) {
-                if (orders1.getPayWay() == 1 || orders1.getPayWay() == 2 || orders1.getPayWay() == 3 || orders1.getPayWay() == 4) {
-                    boolean refund = wxService.refund(orders1.getOrdersNo(), orders1.getPayMoney(), orders1.getPayMoney(), orders1.getPayWay());
                     if (!refund) {
                         return Result.error("退款失败，请联系客服！");
                     }
-                } else if (orders1.getPayWay() == 6) {
+                }
-                    String data = aliPayController.alipayRefund(orders1.getOrdersNo(), orders1.getPayMoney());
+                userMoneyDetails.setManipulateType(1);
+                userMoneyDetails.setBlFlag(2);
+            } else if (orders.getPayWay() == 6) {
+                if(orders.getPayMoney().compareTo(BigDecimal.ZERO) > 0) {
+                    String data = aliPayController.alipayRefund(orders.getOrdersNo(), orders.getPayMoney());
                     if (StringUtils.isNotBlank(data)) {
                         log.error(data);
                         JSONObject jsonObject = JSON.parseObject(data);
@@ -7406,20 +7451,83 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
                     } else {
                         return Result.error("退款失败！");
                     }
-                } else {
-                    if (orders1.getUserArtificerMoney() != null && orders1.getUserArtificerMoney() == 1) {
-                        userMoneyArtificerService.updateMoney(1, orders1.getUserId(), orders1.getArtificerId(), orders1.getPayMoney().doubleValue());
-                    } else {
-                        userMoneyService.updateMoney(1, orders1.getUserId(), orders1.getPayMoney().doubleValue());
-                    }
                 }
-                userMoneyDetails = new UserMoneyDetails();
+                userMoneyDetails.setManipulateType(1);
+                userMoneyDetails.setBlFlag(2);
+            } else {
+//                if (orders.getUserArtificerMoney() != null && orders.getUserArtificerMoney() == 1) {
+//                    userMoneyArtificerService.updateMoney(1, orders.getUserId(), orders.getArtificerId(), orders.getPayMoney().doubleValue());
+//                } else {
+//                    userMoneyService.updateMoney(1, orders.getUserId(), orders.getPayMoney().doubleValue());
+//                }
+                if(orders.getPayMoney().compareTo(BigDecimal.ZERO) > 0) {
+                    userMoneyService.updateMoney(1, orders.getUserId(), orders.getPayMoney().doubleValue());
+                }
                 //查询用户当前余额
-                UserMoney userNowMoney12 = userMoneyService.selectUserMoneyByUserId(orders1.getUserId());
+                UserMoney userNowMoney = userMoneyService.selectUserMoneyByUserId(orders.getUserId());
                 //插入余额
-                userMoneyDetails.setBalance(userNowMoney12.getMoney());
+                userMoneyDetails.setBalance(userNowMoney.getMoney());
                 //插入操作类型为已操作用户余额
                 userMoneyDetails.setManipulateType(2);
+                userMoneyDetails.setBlFlag(1);
+            }
+
+            userMoneyDetails.setMoney(orders.getPayMoney());
+            userMoneyDetails.setUserId(orders.getUserId());
+            userMoneyDetails.setContent("订单号：" + orders.getOrdersNo() + ",已原路退款！");
+            userMoneyDetails.setTitle("订单退款");
+            userMoneyDetails.setType(1);
+            userMoneyDetails.setState(2);
+            userMoneyDetails.setCreateTime(time);
+            userMoneyDetails.setArtificerId(orders.getArtificerId());
+            userMoneyDetails.setBlRole(1);
+            userMoneyDetailsService.save(userMoneyDetails);
+            for (Orders orders1 : ordersList) {
+                userMoneyDetails = new UserMoneyDetails();
+                if (orders1.getPayWay() == 1 || orders1.getPayWay() == 2 || orders1.getPayWay() == 3 || orders1.getPayWay() == 4) {
+                    if(orders1.getPayMoney().compareTo(BigDecimal.ZERO) > 0) {
+                        boolean refund = wxService.refund(orders1.getOrdersNo(), orders1.getPayMoney(), orders1.getPayMoney(), orders1.getPayWay());
+                        if (!refund) {
+                            return Result.error("退款失败，请联系客服！");
+                        }
+                    }
+                    userMoneyDetails.setManipulateType(1);
+                    userMoneyDetails.setBlFlag(2);
+                } else if (orders1.getPayWay() == 6) {
+                    if(orders1.getPayMoney().compareTo(BigDecimal.ZERO) > 0) {
+                        String data = aliPayController.alipayRefund(orders1.getOrdersNo(), orders1.getPayMoney());
+                        if (StringUtils.isNotBlank(data)) {
+                            log.error(data);
+                            JSONObject jsonObject = JSON.parseObject(data);
+                            JSONObject alipay_trade_refund_response = jsonObject.getJSONObject("alipay_trade_refund_response");
+                            String code1 = alipay_trade_refund_response.getString("code");
+                            if (!"10000".equals(code1)) {
+                                return Result.error("退款失败！" + alipay_trade_refund_response.getString("sub_msg"));
+                            }
+                        } else {
+                            return Result.error("退款失败！");
+                        }
+                    }
+                    userMoneyDetails.setManipulateType(1);
+                    userMoneyDetails.setBlFlag(2);
+                } else {
+//                    if (orders1.getUserArtificerMoney() != null && orders1.getUserArtificerMoney() == 1) {
+//                        userMoneyArtificerService.updateMoney(1, orders1.getUserId(), orders1.getArtificerId(), orders1.getPayMoney().doubleValue());
+//                    } else {
+//                        userMoneyService.updateMoney(1, orders1.getUserId(), orders1.getPayMoney().doubleValue());
+//                    }
+                    if(orders1.getPayMoney().compareTo(BigDecimal.ZERO) > 0) {
+                        userMoneyService.updateMoney(1, orders1.getUserId(), orders1.getPayMoney().doubleValue());
+                    }
+                    //查询用户当前余额
+                    UserMoney userNowMoney = userMoneyService.selectUserMoneyByUserId(orders1.getUserId());
+                    //插入余额
+                    userMoneyDetails.setBalance(userNowMoney.getMoney());
+                    //插入操作类型为已操作用户余额
+                    userMoneyDetails.setManipulateType(2);
+                    userMoneyDetails.setBlFlag(1);
+                }
+
                 userMoneyDetails.setMoney(orders1.getPayMoney());
                 userMoneyDetails.setUserId(orders1.getUserId());
                 userMoneyDetails.setContent("订单号：" + orders1.getOrdersNo() + ",已原路退款！");
@@ -7429,15 +7537,14 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
                 userMoneyDetails.setCreateTime(time);
                 userMoneyDetails.setArtificerId(orders.getArtificerId());
                 userMoneyDetails.setBlRole(1);
-                userMoneyDetails.setBlFlag(1);
                 userMoneyDetailsService.save(userMoneyDetails);
                 orders1.setStatus(4);
                 baseMapper.updateById(orders1);
             }
             orders.setStatus(4);
             baseMapper.updateById(orders);
-            UserEntity userEntity = userService.selectUserById(orders.getUserId());
 
+            UserEntity userEntity = userService.selectUserById(orders.getUserId());
             List<OrdersMassage> ordersMassageList = ordersMassageService.list(new QueryWrapper<OrdersMassage>().eq("orders_id", orders.getOrdersId()));
             MassageType massageType = massageTypeService.getById(ordersMassageList.get(0).getMassageId());
             //超过十个字 则截取

src/main/java/com/sqx/modules/bl/commission/fxy/entity/FxyApply.java

@@ -38,6 +38,10 @@ public class FxyApply implements Serializable {
      *电话
      */
     private String phone;
+    /**
+     *等级
+     */
+    private Integer level;
     /**
      *头像
      */

src/main/java/com/sqx/modules/bl/commission/fxy/service/impl/FxyApplyServiceImpl.java

@@ -59,6 +59,7 @@ public class FxyApplyServiceImpl extends ServiceImpl<FxyApplyDao, FxyApply> impl
         }
         UserEntity userEntity = userService.selectUserById(fxyApply.getUserId());
         if(fxyApply.getStatus().equals(1)){
+            userEntity.setBlFxyLevel(fxyApply.getLevel());
             userEntity.setBlIsFxy(1);
         }else{
             userEntity.setBlIsFxy(0);

src/main/java/com/sqx/modules/bl/massage/service/impl/MassagePackageServiceImpl.java

@@ -50,7 +50,9 @@ public class MassagePackageServiceImpl extends ServiceImpl<MassagePackageDao, Ma
         List<MassagePackage> records = iPage.getRecords();
         for(MassagePackage record:records){
             List<MassagePackageDetail> massagePackageDetailList = massagePackageDetailDao.selectList(new QueryWrapper<MassagePackageDetail>().eq("main_id", record.getId()));
-            record.setPackagePrice(massagePackageDetailList.get(0).getPackagePrice());
+            if(massagePackageDetailList!=null && massagePackageDetailList.size()>0){
+                record.setPackagePrice(massagePackageDetailList.get(0).getPackagePrice());
+            }
         }
         return Result.success().put("data",new PageUtils(iPage));
     }

src/main/java/com/sqx/modules/pay/service/impl/WxServiceImpl.java

@@ -1186,6 +1186,7 @@ public class WxServiceImpl implements WxService {
             fxyApply.setName(name);
             fxyApply.setPhone(phone);
             fxyApply.setRemarks(remarks);
+            fxyApply.setLevel(level);
             fxyApplyService.add(fxyApply);
         }
         String generalOrder = getGeneralOrder();

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

@@ -2037,7 +2037,7 @@
     </select>
 
     <select id="getOrdersMoneyById" resultType="com.sqx.modules.artificer.entity.Orders">
-        select
+        select o.artificer_id,o.orders_no,o.end_times,
         (case when o.status = 4
         then o.artificer_money + ifnull(o.add_artificer_money,0)
         else o.artificer_money + ifnull(o.add_artificer_money,0) + ifnull(o2.artificer_money,0) +
@@ -2054,7 +2054,7 @@
         and o.old_orders_id is not null
         and o.status in (3,5)
         union all
-        select
+        select o.artificer_id,o.orders_no,o.end_times,
         o.artificer_money + ifnull(o.add_artificer_money,0) as artificer_money_total,
         o.price,m.classify_id,
         ifnull(o.add_price,0) as add_price,bl.classify_id as add_classify_id

src/main/resources/mapper/bl/commission/fxy/FxyApplyDao.xml

@@ -4,7 +4,7 @@
 <mapper namespace="com.sqx.modules.bl.commission.fxy.dao.FxyApplyDao">
 
     <select id="findPage" resultType="com.sqx.modules.bl.commission.fxy.entity.FxyApply">
-        select a.id,a.user_id,b.avatar,b.user_name,a.name,a.phone,a.remarks,a.create_time,a.status,a.opinion,b.bl_fxy_level,ifnull(c.name,'') as superiorFxy
+        select a.id,a.user_id,b.avatar,b.user_name,a.name,a.phone,a.remarks,a.create_time,a.status,a.opinion,a.level,ifnull(c.name,'') as superiorFxy
         from bl_fxy_apply a
         inner join tb_user b on a.user_id = b.user_id
         left join (
@@ -37,8 +37,8 @@
     </select>
 
     <insert id="add" useGeneratedKeys="true"  keyProperty="id" parameterType="com.sqx.modules.bl.commission.fxy.entity.FxyApply">
-        insert into bl_fxy_apply(user_id,name,phone,remarks,create_time)
+        insert into bl_fxy_apply(user_id,name,phone,level,remarks,create_time)
-        values(#{userId},#{name},#{phone},#{remarks},#{createTime})
+        values(#{userId},#{name},#{phone},#{level},#{remarks},#{createTime})
     </insert>
 
     <update id="update" parameterType="com.sqx.modules.bl.commission.fxy.entity.FxyApply">
@@ -47,6 +47,7 @@
             user_id=#{userId},
             name=#{name},
             phone=#{phone},
+            level=#{level},
             remarks=#{remarks}
         where id=#{id}
     </update>