代码同步

lb-app/src/main/java/com/ydd/app/service/impl/ApiOrderServiceImpl.java

@@ -1381,7 +1381,7 @@ public class ApiOrderServiceImpl implements ApiOrderService {
                 // 其他平台完成
                 if (order.getDeliveryStatus() != 4 && waimaiOrder.getStatus() != null && waimaiOrder.getStatus() == 4) {
                     OrderTrackDto.OrderTrackItem orderTrackItem2 = new OrderTrackDto.OrderTrackItem();
-                    orderTrackItem1.setId(Long.MAX_VALUE);
+                    orderTrackItem2.setId(Long.MAX_VALUE);
                     orderTrackItem2.setOrderStatus(98);
                     orderTrackItem2.setNodeTime(waimaiOrder.getUpdateTime());
                     orderTrackItems.add(orderTrackItem2);

lb-app/src/main/java/com/ydd/app/service/impl/ApiOrderValuationServiceImpl.java

@@ -310,7 +310,7 @@ public class ApiOrderValuationServiceImpl implements ApiOrderValuationService {
         list.sort(Comparator.comparing(ValuationRes::getDeliveryAmount));
         // Res数据组装
         this.setValuationRes(list, res, loginMember, orderReq.getTransport());
-        MemberConfig config = iMemberConfigService.getShopMemberConfig(shopId, null);
+        MemberConfig config = iMemberConfigService.getOne(new QueryWrapper<MemberConfig>().eq("member_id", loginMember.getId()));
         // 运力包发单类型为自定义, 则先按照sort排，再按价格排
         if (packageDeliveryDto != null && PackageDeliveryTypeEnum.CUSTOM.type.equals(packageDeliveryDto.getType())
                 &&config!=null&& !StatusEnum.SHOW.status.equals(config.getLittleMoney())) {//用户配置了省钱模式，运力包排序无效
@@ -318,7 +318,7 @@ public class ApiOrderValuationServiceImpl implements ApiOrderValuationService {
         }
 
         // 处理发单运力
-        List<ValuationRes> billList = this.handleBillList(loginMember.getId(), list);
+        List<ValuationRes> billList = this.handleBillList(config, list);
         // 设置发单时长
         if (packageDeliveryDto != null) {
             billList = this.setBillingDuration(packageDeliveryDto, billList);
@@ -342,10 +342,10 @@ public class ApiOrderValuationServiceImpl implements ApiOrderValuationService {
         return res;
     }
 
-    private List<ValuationRes> handleBillList(Long loginId, List<ValuationRes> list) {
+    private List<ValuationRes> handleBillList( MemberConfig config , List<ValuationRes> list) {
         // 查询下单设置推荐屏蔽运力
         List<ValuationRes> billList = new ArrayList<>();
-        MemberConfig config = iMemberConfigService.getOne(new QueryWrapper<MemberConfig>().eq("member_id", loginId));
+//        MemberConfig config = iMemberConfigService.getOne(new QueryWrapper<MemberConfig>().eq("member_id", loginId));
         if (config != null) {
             if (StringUtils.isNotEmpty(config.getBillDeliveryIds())) {
                 List<String> billDeliveryIds = Arrays.asList(config.getBillDeliveryIds().split(","));