订单优化

src/main/java/com/sqx/map/CommonMapUtils.java

@@ -172,46 +172,52 @@ public class CommonMapUtils {
 		MapEnum mapType = getMapType();
 		JSONObject result = getReverseGeocoding(mapType, longitude, latitude);
 		JSONObject resObject = null;
-		if(result != null) {
+		try {
-			switch (mapType){
+			if (result != null) {
+				switch (mapType) {
 					case TX: {
 						//腾讯地图API
 						resObject = result.getJSONObject("ad_info");//行政区划信息
 						String address = result.getString("address");
-					resObject.put("address",address);
+						resObject.put("address", address);
-					log.info("最终返回的地址对象：{}",resObject);
+						log.info("最终返回的地址对象：{}", resObject);
 						break;
 					}
-				case GD: case TDT: {
+					case GD:
+					case TDT: {
 						//高德API/天地图
 						JSONObject addressComponent = result.getJSONObject("addressComponent");
 						String province = addressComponent.getString("province");
 						String city = addressComponent.getString("city");
 						String adcode = addressComponent.getString("adcode");
 
-					if(StringUtils.equals("[]",city)){
+						if (StringUtils.equals("[]", city)) {
 							city = "";
 						}
 
 						String district = "";
-					if(mapType == MapEnum.GD){
+						if (mapType == MapEnum.GD) {
 							district = addressComponent.getString("district");
-					}else {
+						} else {
 							district = addressComponent.getString("county");
 						}
 						String address = result.getString("formatted_address");
 						resObject = new JSONObject();
-					resObject.put("province",province);//省 / 直辖市
+						resObject.put("province", province);//省 / 直辖市
-					resObject.put("city",city);//市 / 地级区 及同级行政区划，如果当前城市为省直辖县级区划，city与district字段均会返回此城市
+						resObject.put("city", city);//市 / 地级区 及同级行政区划，如果当前城市为省直辖县级区划，city与district字段均会返回此城市
 						resObject.put("adcode", adcode);//市代码
-					resObject.put("district",district);//区 / 县级市 及同级行政区划
+						resObject.put("district", district);//区 / 县级市 及同级行政区划
-					resObject.put("address",address);//经纬度所对应的文字地址 如【北京市东城区东华门街道天安门-城楼】以行政区划+道路+门牌号等信息组成的标准格式化地址
+						resObject.put("address", address);//经纬度所对应的文字地址 如【北京市东城区东华门街道天安门-城楼】以行政区划+道路+门牌号等信息组成的标准格式化地址
-					log.info("最终返回的地址对象：{}",resObject);
+						log.info("最终返回的地址对象：{}", resObject);
 						break;
 					}
-				default: break;
+					default:
+						break;
 				}
 			}
+		}catch(Exception e){
+			e.printStackTrace();
+		}
 		return resObject;
 	}
 

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

@@ -120,9 +120,9 @@ public class ArtificerController {
     @ApiOperation("查询技师列表")
     public Result selectArtificerList(Integer page, Integer limit, Long massageTypeId, String artificerName,
                                       String longitude,String latitude,Integer sort,Integer authentication,
-                                      Integer by,String city,Long classifyId,String phone,Integer isStart,Integer technicianType){
+                                      Integer by,Integer status,String city,Long classifyId,String phone,Integer isStart,Integer technicianType){
         return artificerService.selectArtificerList(page, limit, massageTypeId, artificerName,longitude,latitude,
-                sort,authentication,by,null,city,classifyId,phone,null,isStart,technicianType);
+                sort,authentication,by,status,city,classifyId,phone,null,isStart,technicianType);
     }
 
     @GetMapping("/selectArtificer")

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

@@ -154,6 +154,21 @@ public class Orders implements Serializable {
     /**
      * 加钟价格
      */
+    private BigDecimal addPrice;
+
+    /**
+     * 加钟项目ID
+     */
+    private Long addMassageTypeId;
+
+    /**
+     * 加钟项目名称
+     */
+    private String addEntryName;
+
+    /**
+     * 加钟金额
+     */
     private BigDecimal addMoney;
 
     /**
@@ -368,6 +383,31 @@ public class Orders implements Serializable {
      */
     private Integer massageNum;
 
+    /**
+     * 项目时长
+     */
+    private Integer duration;
+    /**
+     * 原项目ID
+     */
+    private Long oldMassageTypeId;
+    /**
+     * 原项目名称
+     */
+    private String oldEntryName;
+    /**
+     * 原项目金额
+     */
+    private BigDecimal oldMassagePrice;
+    /**
+     * 原项目数量
+     */
+    private Integer oldMassageNum;
+    /**
+     * 原项目时长
+     */
+    private Integer oldMassageDuration;
+
     /**
      * 项目名称
      */

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

@@ -355,6 +355,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
 
         for (OrdersMassage ordersMassage : ordersMassageList) {
             orders.setMassagePrice(massageType.getPrice());
+            orders.setDuration(massageType.getDuration());
             orders.setMassageNum(ordersMassage.getNum());
             price = massageType.getPrice().multiply(BigDecimal.valueOf(ordersMassage.getNum()));
             BigDecimal massagePrice = price.multiply(orders.getTechnicianRate()).divide(new BigDecimal(100)).add(price);//技师等级加成金额
@@ -633,6 +634,9 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
         BigDecimal artificerPrice = new BigDecimal("0.00");
 
         for (OrdersMassage ordersMassage : ordersMassageList) {
+            orders.setMassagePrice(userPackageDetail.getPrice());
+            orders.setDuration(userPackageDetail.getDuration());
+            orders.setMassageNum(ordersMassage.getNum());
             price = userPackageDetail.getPrice().multiply(BigDecimal.valueOf(ordersMassage.getNum()));
             packagePrice = userPackageDetail.getPackagePrice().multiply(BigDecimal.valueOf(ordersMassage.getNum()));
             massageTypeName = userPackageDetail.getTitle();
@@ -999,6 +1003,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
                 if (travelPriceVo == null) {
                     return Result.error("暂不支持当前地址，请更换其他地址！");
                 }
+
                 BigDecimal taxiMoney = new BigDecimal(travelPriceVo.getTravelPrice());
                 orders.setTaxiMoney(taxiMoney);
                 orders.setKm(travelPriceVo.getKilometerNum());
@@ -1016,6 +1021,9 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
                 orders.setMassagePrice(oldOrders.getMassagePrice());
                 orders.setMassageNum(oldOrders.getMassageNum());
                 orders.setOrdersNo(getGeneralOrder());
+                orders.setPrice(oldOrders.getPrice());
+                orders.setCouponMoney(oldOrders.getCouponMoney());
+                orders.setTechnicianRate(oldOrders.getTechnicianRate());
                 baseMapper.insert(orders);
 
                 ordersMassageService.removeByOrdersId(orders.getOrdersId());
@@ -1028,6 +1036,30 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
                 Orders ordersOld = new Orders();
                 ordersOld.setOrdersId(oldOrders.getOrdersId());
                 ordersOld.setStatus(11);
+                UserEntity artificerUser = userService.selectUserById(artificer.getUserId());
+                BigDecimal pingMoney = oldOrders.getPayMoney();
+                UserEntity oneArtificerUser = userService.queryByInvitationCode(artificerUser.getInviterCode());
+                BigDecimal oneArtificerMoney = BigDecimal.ZERO;
+                if (oneArtificerUser != null && oneArtificerUser.getIsAgency() != null && oneArtificerUser.getIsAgency() == 1) {
+                    orders.setOneArtificerUserId(oneArtificerUser.getUserId());
+                    orders.setOneArtificerUserName(oneArtificerUser.getUserName());
+                    oneArtificerMoney = pingMoney.multiply(oneArtificerUser.getShopRate());
+                }
+                BigDecimal shopMoney = BigDecimal.ZERO;
+                if (artificerUser.getConsortiaId() != null) {
+                    Consortia consortia = consortiaService.getById(artificerUser.getConsortiaId());
+                    if (consortia != null && consortia.getUserId() != null) {
+                        UserEntity consortiaUser = userService.getById(consortia.getUserId());
+                        if (consortiaUser != null) {
+                            shopMoney = pingMoney.multiply(consortia.getRate());
+                            orders.setConsortiaId(consortia.getConsortiaId());
+                            orders.setShopUserId(consortiaUser.getUserId());
+                            orders.setShopUserName(consortiaUser.getUserName());
+                        }
+                    }
+                }
+                orders.setShopMoney(shopMoney);
+                orders.setOneArtificerMoney(oneArtificerMoney);
                 baseMapper.updateById(ordersOld);//原单暂变成挂单状态
                 return Result.success().put("data", orders);
             }
@@ -1050,6 +1082,9 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
                     massageTypeId = ordersMassageList.get(0).getMassageId();
                     MassageType massageType = massageTypeService.getById(massageTypeId);
                     for (OrdersMassage ordersMassage : ordersMassageList) {
+                        orders.setMassagePrice(massageType.getPrice());
+                        orders.setDuration(massageType.getDuration());
+                        orders.setMassageNum(ordersMassage.getNum());
                         price = massageType.getPrice().multiply(BigDecimal.valueOf(ordersMassage.getNum()));
                     }
                     orders.setPrice(price);
@@ -1076,7 +1111,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
                 orders.setStartLongitude(oldOrders.getStartLongitude());
                 orders.setStartLatitude(oldOrders.getStartLatitude());
                 orders.setTripWay(oldOrders.getTripWay());
-                orders.setTaxiMoney(BigDecimal.ZERO);
+                orders.setTaxiMoney(oldOrders.getTaxiMoney());
                 orders.setKm(oldOrders.getKm());
                 orders.setStartAddress(oldOrders.getStartAddress());
                 orders.setStartTime(oldOrders.getStartTime());
@@ -1087,6 +1122,11 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
                 orders.setStartImg(oldOrders.getStartImg());
                 orders.setOldOrdersId(oldOrders.getOrdersId());
                 orders.setOldMassageMoney(oldOrders.getMassageMoney());
+                orders.setOldMassageTypeId(oldOrders.getMassageTypeId());
+                orders.setOldEntryName(oldOrders.getEntryName());
+                orders.setOldMassagePrice(oldOrders.getMassagePrice());
+                orders.setOldMassageNum(oldOrders.getMassageNum());
+                orders.setOldMassageDuration(oldOrders.getDuration());
 
                 //获取用户VIP的优惠信息
                 BigDecimal vipRate = new BigDecimal(100);
@@ -1962,7 +2002,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
         }
         if(CommonEnum.V3_ORDER_FORM_CANCEL_NOT_START_03 == commonEnum){
             //距离服务开始前取消少于n分钟内，收取n元，扣服务费，全额退车费
-            massageDeduction = new BigDecimal(values[2]);
+            massageDeduction = new BigDecimal(values[1]);
             trafficDeduction = BigDecimal.ZERO;
             massageRate = BigDecimal.ZERO;
             trafficRate = BigDecimal.ZERO;
@@ -2071,6 +2111,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
             userMoneyDetails.setContent("订单号：" + orders.getOrdersNo() + ",已原路退款！扣除订单：" + massageMoneyDeduction + "，车费：" + taxiMoneyDeduction);
             userMoneyDetails.setTitle("订单退款");
             userMoneyDetails.setType(1);
+            userMoneyDetails.setState(2);
             userMoneyDetails.setCreateTime(time);
             userMoneyDetails.setArtificerId(orders.getArtificerId());
             userMoneyDetails.setBlRole(1);
@@ -2173,6 +2214,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
                 }
             }
             userMoneyDetails.setType(1);
+            userMoneyDetails.setState(2);
             userMoneyDetails.setCreateTime(simpleDateFormat.format(new Date()));
             userMoneyDetails.setBlRole(2);
             userMoneyDetails.setBlFlag(1);
@@ -2297,6 +2339,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
                 userMoneyDetails.setContent("订单号：" + orders1.getOrdersNo() + ",已原路退款！");
                 userMoneyDetails.setTitle("订单退款");
                 userMoneyDetails.setType(1);
+                userMoneyDetails.setState(2);
                 userMoneyDetails.setCreateTime(time);
                 userMoneyDetails.setArtificerId(orders.getArtificerId());
                 userMoneyDetails.setBlRole(1);
@@ -2444,6 +2487,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
             userMoneyDetails.setContent("订单号：" + orders.getOrdersNo() + ",已原路退款！扣除订单：" + BigDecimal.ZERO + "，车费：" + taxiMoneyDeduction);
             userMoneyDetails.setTitle("订单退款");
             userMoneyDetails.setType(1);
+            userMoneyDetails.setState(2);
             userMoneyDetails.setCreateTime(time);
             userMoneyDetails.setArtificerId(orders.getArtificerId());
             userMoneyDetails.setBlRole(1);
@@ -2488,6 +2532,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
                     "，打车费：" + orders.getTaxiMoney() + "，平台扣除打车费：" + orders.getPingTaxiMoney() + "，到账打车费：" + orders.getArtificerTaxiMoney() +
                     "，到账总金额：" + orders.getSumArtificerMoney());
             userMoneyDetails.setType(1);
+            userMoneyDetails.setState(2);
             userMoneyDetails.setCreateTime(simpleDateFormat.format(new Date()));
             userMoneyDetails.setBlRole(2);
             userMoneyDetails.setBlFlag(1);
@@ -2536,6 +2581,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
                 userMoneyDetails.setContent("订单号：" + orders1.getOrdersNo() + ",已原路退款！");
                 userMoneyDetails.setTitle("订单退款");
                 userMoneyDetails.setType(1);
+                userMoneyDetails.setState(2);
                 userMoneyDetails.setCreateTime(time);
                 userMoneyDetails.setArtificerId(orders.getArtificerId());
                 userMoneyDetails.setBlRole(1);
@@ -2700,6 +2746,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
                     userMoneyDetails.setContent("订单号：" + orders.getOrdersNo() + ",车费已原路退款！");
                     userMoneyDetails.setTitle("订单退款");
                     userMoneyDetails.setType(1);
+                    userMoneyDetails.setState(2);
                     userMoneyDetails.setCreateTime(time);
                     userMoneyDetails.setArtificerId(orders.getArtificerId());
                     userMoneyDetails.setBlRole(1);
@@ -2790,6 +2837,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
                     userMoneyDetails.setTitle("订单号：" + orders.getOrdersNo() + ",订单超时转为待补单！");
                     userMoneyDetails.setContent("用户订单超时转为待补单，总扣除：" + sumMoney + "，到账总金额：" + orders.getSumArtificerMoney());
                     userMoneyDetails.setType(1);
+                    userMoneyDetails.setState(2);
                     userMoneyDetails.setCreateTime(simpleDateFormat.format(new Date()));
                     userMoneyDetails.setBlRole(2);
                     userMoneyDetails.setBlFlag(1);
@@ -2874,6 +2922,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
             userMoneyDetails.setContent("订单号：" + orders.getOrdersNo() + ",订单已原路退款！");
             userMoneyDetails.setTitle("订单退款");
             userMoneyDetails.setType(1);
+            userMoneyDetails.setState(2);
             userMoneyDetails.setCreateTime(time);
             userMoneyDetails.setArtificerId(orders.getArtificerId());
             userMoneyDetails.setBlRole(1);
@@ -2977,6 +3026,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
             userMoneyDetails.setContent("订单号：" + orders.getOrdersNo() + ",已原路退款！");
             userMoneyDetails.setTitle("订单退款");
             userMoneyDetails.setType(1);
+            userMoneyDetails.setState(2);
             userMoneyDetails.setCreateTime(time);
             userMoneyDetails.setArtificerId(orders.getArtificerId());
             userMoneyDetails.setBlRole(1);
@@ -3095,6 +3145,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
                     userMoneyDetails.setContent("订单号：" + orders.getOrdersNo() + ",车费已原路退款！");
                     userMoneyDetails.setTitle("订单退款");
                     userMoneyDetails.setType(1);
+                    userMoneyDetails.setState(2);
                     userMoneyDetails.setCreateTime(time);
                     userMoneyDetails.setArtificerId(orders.getArtificerId());
                     userMoneyDetails.setBlRole(1);
@@ -3184,6 +3235,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
                     userMoneyDetails.setTitle("订单号：" + orders.getOrdersNo() + ",订单超时转为待补单！");
                     userMoneyDetails.setContent("用户订单超时转为待补单，总扣除：" + sumMoney + "，到账总金额：" + orders.getSumArtificerMoney());
                     userMoneyDetails.setType(1);
+                    userMoneyDetails.setState(2);
                     userMoneyDetails.setCreateTime(simpleDateFormat.format(new Date()));
                     userMoneyDetails.setBlRole(2);
                     userMoneyDetails.setBlFlag(1);
@@ -3302,6 +3354,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
             userMoneyDetails.setContent("订单号：" + orders.getOrdersNo() + ",已原路退款！");
             userMoneyDetails.setTitle("订单退款");
             userMoneyDetails.setType(1);
+            userMoneyDetails.setState(2);
             userMoneyDetails.setCreateTime(time);
             userMoneyDetails.setArtificerId(orders.getArtificerId());
             userMoneyDetails.setBlRole(1);
@@ -3437,6 +3490,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
         userMoneyDetails.setContent("订单号：" + orders.getOrdersNo() + ",已原路退款！");
         userMoneyDetails.setTitle("订单退款");
         userMoneyDetails.setType(1);
+        userMoneyDetails.setState(2);
         userMoneyDetails.setCreateTime(time);
         userMoneyDetails.setArtificerId(orders.getArtificerId());
         userMoneyDetailsService.save(userMoneyDetails);
@@ -3490,6 +3544,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
                 userMoneyDetails.setContent("订单号：" + orders1.getOrdersNo() + ",已原路退款！");
                 userMoneyDetails.setTitle("订单退款");
                 userMoneyDetails.setType(1);
+                userMoneyDetails.setState(2);
                 userMoneyDetails.setCreateTime(time);
                 userMoneyDetails.setArtificerId(orders.getArtificerId());
 
@@ -3595,6 +3650,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
         if(orders.getAddNum()!=null){
             QueryWrapper<Orders> ordersQueryWrapper = new QueryWrapper<Orders>();
             ordersQueryWrapper.eq("parent_id",orders.getOrdersId());
+            ordersQueryWrapper.ne("status",4);
             Orders jzOrder = baseMapper.selectOne(ordersQueryWrapper);
             orders.setJzName(jzOrder.getEntryName());
         }
@@ -3602,6 +3658,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
         if(orders.getIsSupplement()!=null){
             QueryWrapper<Orders> ordersQueryWrapper = new QueryWrapper<Orders>();
             ordersQueryWrapper.eq("old_orders_id",orders.getOldOrdersId());
+            ordersQueryWrapper.ne("status",4);
             Orders jzOrder = baseMapper.selectOne(ordersQueryWrapper);
             orders.setGjName(jzOrder.getEntryName());
             BigDecimal massageMoney = orders.getMassageMoney();
@@ -3935,9 +3992,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
 //        }
 
         if(orders.getIsSupplement() != null){
-            if(orders.getIsSupplement() == 1){
+            if(orders.getIsSupplement() == 2){
-                orders.setStatus(10);
-            }else if(orders.getIsSupplement() == 2){
                 orders.setStatus(6);
             }else if(orders.getIsSupplement() == 3){
                 orders.setStatus(2);
@@ -4059,7 +4114,6 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
                 orders1.setAddMoney(orders.getPayMoney());
                 orders1.setAddArtificerMoney(orders.getArtificerMoney());
             }
-
             orders1.setSumMoney(orders1.getSumMoney().add(orders.getPayMoney()));
             orders1.setSumArtificerMoney(orders1.getSumArtificerMoney().multiply(rate).add(orders.getArtificerMoney()));
 
@@ -4102,7 +4156,9 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
                 calendar.add(Calendar.MINUTE, duration);
                 orders1.setEndTime(endTime);
             }
-
+            orders1.setAddPrice(orders.getPrice());
+            orders1.setAddMassageTypeId(orders.getMassageTypeId());
+            orders1.setAddEntryName(orders.getEntryName());
             baseMapper.updateById(orders1);
             if (flag) {
                 baseMapper.update(null, Wrappers.<Orders>lambdaUpdate()
@@ -4352,7 +4408,9 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
                 calendar.add(Calendar.MINUTE, duration);
                 orders1.setEndTime(endTime);
             }
-
+            orders1.setAddPrice(orders.getPrice());
+            orders1.setAddMassageTypeId(orders.getMassageTypeId());
+            orders1.setAddEntryName(orders.getEntryName());
             baseMapper.updateById(orders1);
             if (flag) {
                 baseMapper.update(null, Wrappers.<Orders>lambdaUpdate()
@@ -4523,7 +4581,10 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
         userMoneyDetails.setManipulateType(2);
         userMoneyDetails.setTitle("开通会员");
         userMoneyDetails.setType(2);
+        userMoneyDetails.setState(2);
         userMoneyDetails.setCreateTime(simpleDateFormat.format(new Date()));
+        userMoneyDetails.setBlRole(1);
+        userMoneyDetails.setBlFlag(1);
         userMoneyDetailsService.save(userMoneyDetails);
         messageInfo.setTitle("开通会员");
         messageInfo.setState(String.valueOf(4));
@@ -4539,6 +4600,16 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
         return Result.success();
     }
 
+    /**
+     * 完成订单
+     * @param ordersId
+     * @param type
+     * @param jsFwcn
+     * @param jsPjtag
+     * @param jsTsbz
+     * @return
+     */
+    @Transactional
     @Override
     public Result accomplishOrders(Long ordersId, Integer type, String accomplishLongitude, String accomplishLatitude,String jsFwcn,String  jsPjtag,String jsTsbz,String earlyFinishReason) {
         reentrantReadWriteLock.writeLock().lock();
@@ -4766,7 +4837,6 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
 
             if(orders.getOldOrdersId()!=null && orders.getOldOrdersId() !=0){
                 Orders oldOrders = baseMapper.selectById(orders.getOldOrdersId());
-                oldOrders.setStatus(5);
                 oldOrders.setArtificerId(orders.getArtificerId());
                 oldOrders.setUserId(orders.getUserId());
                 oldOrders.setUserName(orders.getUserName());
@@ -4804,22 +4874,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
         }
     }
 
-    private Result accomplishOldOrders(Orders orders, Integer type, String jsFwcn,String  jsPjtag,String jsTsbz) {
+    private void accomplishOldOrders(Orders orders, Integer type, String jsFwcn,String  jsPjtag,String jsTsbz) throws Exception{
-        reentrantReadWriteLock.writeLock().lock();
-        try {
-            if (type == 1) {
-                if (orders.getStatus().equals(1)) {
-                    return Result.error("订单未付款！");
-                } else if (orders.getStatus().equals(3) || orders.getStatus().equals(5)) {
-                    return Result.error("订单已经完成了！");
-                } else if (orders.getStatus().equals(4)) {
-                    return Result.error("订单已经取消！");
-                }
-            } else {
-                if (!orders.getStatus().equals(6)) {
-                    return Result.error("请刷新页面后重试！");
-                }
-            }
 
         Artificer artificer = artificerService.getById(orders.getArtificerId());
         //修改技师钱包  1是加 2是减
@@ -4947,6 +5002,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
         orders.setJsFwcn(jsFwcn);
         orders.setJsPjtag(jsPjtag);
         orders.setJsTsbz(jsTsbz);
+        orders.setStatus(5);
         //修改订单表类型
         baseMapper.updateById(orders);
         //修改订单下所有加钟的状态为待评价
@@ -4996,9 +5052,8 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
             userService.sendWxMessage(apkey, data, user.getWxOpenId());
         }
 
-            if(orders.getOldOrdersId()!=null && orders.getOldOrdersId() !=0){
+        if(orders.getOldOrdersId()!=null && orders.getOldOrdersId() !=0) {
             Orders oldOrders = baseMapper.selectById(orders.getOldOrdersId());
-                oldOrders.setStatus(5);
             oldOrders.setArtificerId(orders.getArtificerId());
             oldOrders.setUserId(orders.getUserId());
             oldOrders.setUserName(orders.getUserName());
@@ -5023,15 +5078,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
             oldOrders.setStartAddress(orders.getStartAddress());
             oldOrders.setAccomplishAddress(orders.getAccomplishAddress());
             oldOrders.setArtificerRate(orders.getArtificerRate());
-                accomplishOldOrders(oldOrders,type,jsFwcn,jsPjtag,jsTsbz);
+            accomplishOldOrders(oldOrders, type, jsFwcn, jsPjtag, jsTsbz);
-            }
-            return Result.success();
-        } catch (Exception e) {
-            e.printStackTrace();
-            log.error("完成订单异常：" + e.getMessage(), e);
-            return Result.error("系统错误，请联系管理员");
-        } finally {
-            reentrantReadWriteLock.writeLock().unlock();
         }
     }
 
@@ -5238,8 +5285,11 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
             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) {
@@ -5279,8 +5329,11 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
                 userMoneyDetails.setContent("订单号：" + orders1.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);
                 orders1.setStatus(4);
                 baseMapper.updateById(orders1);
@@ -5528,7 +5581,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
             orders.setStatus(4);
             baseMapper.updateById(orders);
             artificerTimeService.remove(new QueryWrapper<ArtificerTime>().eq("orders_id", orders.getOrdersId()));
-            if (orders.getCouponId() != null) {
+            if (orders.getCouponId() != null && orders.getOldOrdersId()==null) {
                 CouponUser couponUser = couponUserService.getById(orders.getCouponId());
                 if (couponUser != null && couponUser.getStatus().equals(1)) {
                     couponUser.setStatus(0);

src/main/java/com/sqx/modules/pay/controller/app/AliPayController.java

@@ -419,6 +419,7 @@ public class AliPayController {
                             userMoneyDetails.setContent("支付宝花费:"+payClassify.getPrice());
                             userMoneyDetails.setMoney(payClassify.getPrice());
                             userMoneyDetails.setType(2);
+                            userMoneyDetails.setState(2);
                             userMoneyDetails.setBlRole(1);
                             userMoneyDetails.setBlFlag(2);
                             userMoneyDetailsService.save(userMoneyDetails);
@@ -1177,6 +1178,7 @@ public class AliPayController {
                         userMoneyDetails.setContent("支付宝花费:"+payClassify.getPrice());
                         userMoneyDetails.setMoney(payClassify.getPrice());
                         userMoneyDetails.setType(2);
+                        userMoneyDetails.setState(2);
                         userMoneyDetails.setBlRole(1);
                         userMoneyDetails.setBlFlag(2);
                         userMoneyDetailsService.save(userMoneyDetails);

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

@@ -859,8 +859,8 @@ public class WxServiceImpl implements WxService {
 //                                userMoneyDetails.setType(1);
                                 userMoneyDetails.setManipulateType(1);
                                 userMoneyDetails.setType(2);
-                                userMoneyDetails.setMoney(BigDecimal.valueOf(cashDeposit));
                                 userMoneyDetails.setState(2);
+                                userMoneyDetails.setMoney(BigDecimal.valueOf(cashDeposit));
                                 userMoneyDetails.setClassify(1);
                                 userMoneyDetails.setCreateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
                                 userMoneyDetails.setBlRole(2);
@@ -892,6 +892,7 @@ public class WxServiceImpl implements WxService {
                                 userMoneyDetails.setContent("支付宝花费:"+payClassify.getPrice());
                                 userMoneyDetails.setMoney(payClassify.getPrice());
                                 userMoneyDetails.setType(2);
+                                userMoneyDetails.setState(2);
                                 userMoneyDetails.setBlRole(1);
                                 userMoneyDetails.setBlFlag(2);
                                 userMoneyDetailsService.save(userMoneyDetails);
@@ -1244,10 +1245,12 @@ public class WxServiceImpl implements WxService {
                                 userMoneyDetails.setTitle("缴纳保证金");
                                 userMoneyDetails.setContent("已缴纳保证金："+cashDeposit+"元");
                                 userMoneyDetails.setType(1);
-                                userMoneyDetails.setMoney(BigDecimal.valueOf(cashDeposit));
                                 userMoneyDetails.setState(2);
+                                userMoneyDetails.setMoney(BigDecimal.valueOf(cashDeposit));
                                 userMoneyDetails.setClassify(1);
                                 userMoneyDetails.setCreateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+                                userMoneyDetails.setBlRole(2);
+                                userMoneyDetails.setBlFlag(2);
                                 userMoneyDetailsService.save(userMoneyDetails);
                             }else if(payDetails.getType()==3){
                                 userMoneyDao.updateMayMoney(1, payDetails.getUserId(), payDetails.getMoney());
@@ -1256,9 +1259,12 @@ public class WxServiceImpl implements WxService {
                                 userMoneyDetails.setTitle("微信充值");
                                 userMoneyDetails.setContent("微信充值:"+payDetails.getMoney());
                                 userMoneyDetails.setType(1);
+                                userMoneyDetails.setState(2);
                                 userMoneyDetails.setMoney(BigDecimal.valueOf(payDetails.getMoney()));
                                 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                                 userMoneyDetails.setCreateTime(sdf.format(new Date()));
+                                userMoneyDetails.setBlRole(1);
+                                userMoneyDetails.setBlFlag(2);
                                 userMoneyDetailsService.save(userMoneyDetails);
                             }
                         }

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

@@ -620,12 +620,8 @@
         </if>
         <if test="type==5">
             and date_format(o.serve_time,'%Y-%m-%d') = date_format(now(),'%Y-%m-%d') and o.status=2
-            order by o.serve_time asc
         </if>
-        <if test="type!=5">
         order by o.serve_time desc
-        </if>
-
     </select>
 
     <select id="selectArtificerOrder" resultType="com.sqx.modules.artificer.entity.Orders">