feat: 退货退款 也是24小时没审核 自动通过

fs-admin/src/main/java/com/fs/task/StoreTask.java

@@ -366,12 +366,12 @@ public class StoreTask {
         if (list != null) {
             for (FsStoreAfterSales afterSales : list) {
                 //仅退款
-                if (afterSales.getServiceType().equals(0)) {
+//                if (afterSales.getServiceType().equals(0)) {
                     FsStoreAfterSalesAudit1Param audit1Param = new FsStoreAfterSalesAudit1Param();
                     audit1Param.setSalesId(afterSales.getId());
                     audit1Param.setOperator("平台");
                     afterSalesService.audit1(audit1Param);
-                }
+//                }
             }
         }
     }

fs-admin/src/test/java/com/fs/store/controller/FsStorePaymentControllerTest.java

@@ -179,154 +179,7 @@ public class FsStorePaymentControllerTest {
     @Test
     public void fixWxExpress(){
         List<String> bankTrxIds = Arrays.asList(
-                "4200002641202507015854132060",
-                "4200002730202507010585137790",
-                "4200002720202507011716728434",
-                "4200002640202506305334957109",
-                "4200002649202506308389926327",
-                "4200002744202506301134168611",
-                "4200002657202506305253885830",
-                "4200002742202506294065544939",
-                "4200002646202506290678964674",
-                "4200002730202506290169087232",
-                "4200002639202506295681468881",
-                "4200002663202506295495889025",
-                "4200002649202506291445021052",
-                "4200002744202506280680760540",
-                "4200002635202506284191091408",
-                "4200002656202506285273335101",
-                "4200002743202506288914905137",
-                "4200002643202506286623634610",
-                "4200002743202506282965581155",
-                "4200002737202506287558895883",
-                "4200002736202506251277657543",
-                "4200002735202506253277037320",
-                "4200002652202506254837674288",
-                "4200002645202506251296123074",
-                "4200002644202506256761292850",
-                "4200002641202506252183156757",
-                "4200002742202506241338120931",
-                "4200002744202506249664154866",
-                "4200002663202506246584120213",
-                "4200002653202506245360228516",
-                "4200002721202506247137648457",
-                "4200002646202506239575111341",
-                "4200002738202506230718968779",
-                "4200002736202506236962272488",
-                "4200002733202506230550173916",
-                "4200002738202506232322453502",
-                "4200002725202506239319858501",
-                "4200002634202506225400496329",
-                "4200002738202506210520565498",
-                "4200002729202506214580870247",
-                "4200002740202506210566404836",
-                "4200002667202506204390460462",
-                "4200002719202506202245237392",
-                "4200002651202506202505391109",
-                "4200002656202506200517612411",
-                "4200002722202506203205725652",
-                "4200002638202506209508809661",
-                "4200002634202506201882461115",
-                "4200002651202506204904211840",
-                "4200002644202506195185880011",
-                "4200002666202506195309219440",
-                "4200002663202506191821261470",
-                "4200002742202506197219115356",
-                "4200002661202506192063355144",
-                "4200002644202506192082596482",
-                "4200002743202506193920004348",
-                "4200002743202506194808329574",
-                "4200002720202506190965448507",
-                "4200002647202506196599952449",
-                "4200002730202506184844995094",
-                "4200002653202506183863644113",
-                "4200002652202506180186949103",
-                "4200002659202506183623841919",
-                "4200002740202506172644740642",
-                "4200002742202506178743555065",
-                "4200002732202506171267939585",
-                "4200002651202506175123791558",
-                "4200002657202506170611506263",
-                "4200002647202506171301431312",
-                "4200002637202506173737816365",
-                "4200002738202506171968866663",
-                "4200002659202506165656184481",
-                "4200002717202506169663432767",
-                "4200002650202506161172685391",
-                "4200002659202506164966156440",
-                "4200002734202506164775501452",
-                "4200002740202506160769069776",
-                "4200002722202506163042719744",
-                "4200002649202506161824273813",
-                "4200002726202506165301273935",
-                "4200002657202506165156481155",
-                "4200002735202506166987141135",
-                "4200002719202506167087266893",
-                "4200002744202506160008840176",
-                "4200002655202506167773681232",
-                "4200002734202506169209923092",
-                "4200002635202506164201341642",
-                "4200002737202506165193916541",
-                "4200002649202506161578648661",
-                "4200002638202506156849499130",
-                "4200002649202506141874130867",
-                "4200002724202506145728385590",
-                "4200002728202506141922478064",
-                "4200002648202506148585209847",
-                "4200002723202506130920024825",
-                "4200002718202506135916678677",
-                "4200002643202506134852730012",
-                "4200002660202506137636545976",
-                "4200002643202506135753987653",
-                "4200002720202506131675723765",
-                "4200002656202506138717903144",
-                "4200002634202506135733701457",
-                "4200002731202506139167503493",
-                "4200002643202506133443744265",
-                "4200002725202506135997387574",
-                "4200002666202506139199351639",
-                "4200002636202506133711103487",
-                "4200002664202506132638393649",
-                "4200002728202506125152607273",
-                "4200002731202506121791552804",
-                "4200002736202506110603029380",
-                "4200002740202506110249500157",
-                "4200002663202506108818116257",
-                "4200002724202506095562739311",
-                "4200002637202506090652296466",
-                "4200002647202506092391012025",
-                "4200002666202506091720900852",
-                "4200002635202506088959312800",
-                "4200002650202506080639425729",
-                "4200002720202506089163486252",
-                "4200002637202506084155306477",
-                "4200002730202506077484183210",
-                "4200002735202506070941030926",
-                "4200002662202506067276982964",
-                "4200002644202506031196471261",
-                "4200002720202505318926638602",
-                "4200002731202505297469535491",
-                "4200002667202505296263452797",
-                "4200002668202505284960560898",
-                "4200002719202505236963549382",
-                "4200002636202505232145087500",
-                "4200002743202505239292557118",
-                "4200002730202505235177423336",
-                "4200002734202505233517097589",
-                "4200002720202505237107093665",
-                "4200002735202505221011471952",
-                "4200002728202505161124147502",
-                "4200002651202505129141813092",
-                "4200002641202505109484259131",
-                "4200002723202505096888478533",
-                "4200002633202505061827450653",
-                "4200002618202505061849718677",
-                "4200002658202505054041839873",
-                "4200002607202505059650896891",
-                "4200002603202505043338678460",
-                "4200002613202505044879711568",
-                "4200002646202505036983340019",
-                "4200002634202505019722463479"
+                "4200002772202508045830995186"
         );
         List<FsStorePayment> fsStorePaymentList = fsStorePaymentService.queryByBankTrxId(bankTrxIds);
         for (FsStorePayment fsStorePayment : fsStorePaymentList) {

fs-service-system/src/main/java/com/fs/store/service/impl/FsStoreOrderServiceImpl.java

@@ -270,6 +270,9 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
     private FsWarehousesMapper fsWarehousesMapper;
 
 
+    @Autowired
+    private FsUserMapper fsUserMapper;
+
     @Override
     public void syncExpressToWx() {
         List<FsWxExpressTask> fsWxExpressTasks = fsWxExpressTaskMapper.selectPendingData();
@@ -280,67 +283,70 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
 
         for (FsWxExpressTask fsWxExpressTask : fsWxExpressTasks) {
 
-            UploadShippingInfoRequest request = new UploadShippingInfoRequest();
-
-            OrderKey orderKey = new OrderKey();
-            orderKey.setOrderNumberType(2);
-
-
-
-            FsUser fsUser = fsUserCacheService.selectFsUserById(fsWxExpressTask.getUserId());
-            FsStoreOrder fsStoreOrder = fsStoreOrderMapper.selectFsStoreOrderByOrderCode(fsWxExpressTask.getOrderCode());
-
-
-            if(ObjectUtil.isNotNull(fsStoreOrder)){
-                List<FsStorePayment> fsStorePayments = paymentService.selectFsStorePaymentByOrder(fsStoreOrder.getId());
-
-
-                if(CollectionUtils.isNotEmpty(fsStorePayments)){
-                    FsStorePayment fsStorePayment = fsStorePayments.get(0);
-                    orderKey.setTransactionId(fsStorePayment.getBankTransactionId());
-                }
-            }
-
-            String userPhone = "";
-            String orderGoodsInfo = "商品";
-            if(fsStoreOrder != null){
-                userPhone = fsStoreOrder.getUserPhone();
-                orderGoodsInfo = getOrderGoodsInfo(fsStoreOrder);
-            }
-
-            Payer payer = new Payer();
-            if(StringUtils.isNotBlank(fsUser.getMaOpenId())){
-                payer.setOpenid(fsUser.getMaOpenId());
-            }
-            request.setPayer(payer);
-            request.setOrderKey(orderKey);
-
-            request.setLogisticsType(1);
-            request.setDeliveryMode(1);
-
-            request.setShippingList(Collections.singletonList(ShippingItem.builder()
-                    .itemDesc(orderGoodsInfo)
-                            .expressCompany(fsWxExpressTask.getExpressCompany())
-                            .trackingNo(fsWxExpressTask.getExpressNo())
-                            .contact(Contact.builder().consignorContact(userPhone).build())
-                    .build()));
-
-            OffsetDateTime now = OffsetDateTime.now();
-            DateTimeFormatter formatter = DateTimeFormatter.ISO_OFFSET_DATE_TIME;
-            String formattedTimestamp = now.format(formatter);
-            request.setUploadTime(formattedTimestamp);
-
-
-            WeChatApiResponse response = shippingService.uploadShippingInfo(request);
-            if(ObjectUtil.equal(response.getErrcode(),0)){
-                fsWxExpressTask.setStatus(2);
-            } else {
-                fsWxExpressTask.setRetryCount(fsWxExpressTask.getRetryCount() +1);
-                fsWxExpressTask.setStatus(3);
-                fsWxExpressTask.setData(JSON.toJSONString(request));
-                fsWxExpressTask.setRequestBody(JSON.toJSONString(request));
-                fsWxExpressTask.setResponseBody(JSON.toJSONString(response));
-            }
+          try{
+              UploadShippingInfoRequest request = new UploadShippingInfoRequest();
+
+              OrderKey orderKey = new OrderKey();
+              orderKey.setOrderNumberType(2);
+
+
+              FsUser fsUser = fsUserMapper.selectFsUserById(fsWxExpressTask.getUserId());
+              FsStoreOrder fsStoreOrder = fsStoreOrderMapper.selectFsStoreOrderByOrderCode(fsWxExpressTask.getOrderCode());
+
+
+              if(ObjectUtil.isNotNull(fsStoreOrder)){
+                  List<FsStorePayment> fsStorePayments = paymentService.selectFsStorePaymentByOrder(fsStoreOrder.getId());
+
+
+                  if(CollectionUtils.isNotEmpty(fsStorePayments)){
+                      FsStorePayment fsStorePayment = fsStorePayments.get(0);
+                      orderKey.setTransactionId(fsStorePayment.getBankTransactionId());
+                  }
+              }
+
+              String userPhone = "";
+              String orderGoodsInfo = "商品";
+              if(fsStoreOrder != null){
+                  userPhone = fsStoreOrder.getUserPhone();
+                  orderGoodsInfo = getOrderGoodsInfo(fsStoreOrder);
+              }
+
+              Payer payer = new Payer();
+              if(StringUtils.isNotBlank(fsUser.getMaOpenId())){
+                  payer.setOpenid(fsUser.getMaOpenId());
+              }
+              request.setPayer(payer);
+              request.setOrderKey(orderKey);
+
+              request.setLogisticsType(1);
+              request.setDeliveryMode(1);
+
+              request.setShippingList(Collections.singletonList(ShippingItem.builder()
+                      .itemDesc(orderGoodsInfo)
+                      .expressCompany(fsWxExpressTask.getExpressCompany())
+                      .trackingNo(fsWxExpressTask.getExpressNo())
+                      .contact(Contact.builder().consignorContact(userPhone).build())
+                      .build()));
+
+              OffsetDateTime now = OffsetDateTime.now();
+              DateTimeFormatter formatter = DateTimeFormatter.ISO_OFFSET_DATE_TIME;
+              String formattedTimestamp = now.format(formatter);
+              request.setUploadTime(formattedTimestamp);
+
+
+              WeChatApiResponse response = shippingService.uploadShippingInfo(request);
+              if(ObjectUtil.equal(response.getErrcode(),0)){
+                  fsWxExpressTask.setStatus(2);
+              } else {
+                  fsWxExpressTask.setRetryCount(fsWxExpressTask.getRetryCount() +1);
+                  fsWxExpressTask.setStatus(3);
+                  fsWxExpressTask.setData(JSON.toJSONString(request));
+                  fsWxExpressTask.setRequestBody(JSON.toJSONString(request));
+                  fsWxExpressTask.setResponseBody(JSON.toJSONString(response));
+              }
+          }catch (Exception e){
+              logger.info("该单 {} 推送到物流失败！",fsWxExpressTask);
+          }
         }
         fsWxExpressTaskMapper.batchUpdate(fsWxExpressTasks);