yiqi-admin/src/main/java/com/yiqi/admin/controller/order/OrderClothItemController.java

@@ -889,7 +889,8 @@ public class OrderClothItemController extends BaseController {
         OrderClothItem orderClothItem = orderClothItemService.getOne(queryWrapper
         );
         if (orderClothItem == null) {
-            throw new ServiceException("未查询到数据");
+            return R.ok();
+//            throw new ServiceException("未查询到数据");
         }
         OrderClothItemVO orderClothItemVO = new OrderClothItemVO();
         BeanUtils.copyProperties(orderClothItem, orderClothItemVO);

yiqi-admin/src/main/resources/application.yml

@@ -136,9 +136,9 @@ wx:
     publicSecret: fc571b42c90b6d476f66935dd05d011d
     token: token
     encodingAESKey: encodingAESKey
-    apiAesSn: XX
+    apiAesSn: 75745773fb26d294eb750494bf83812c
     apiAesKey: +goeHSHQ4oVafMbCC5wDrv5mDvKIVWSU7Lh0lPoq974=
-    apiRsaSn: XX
+    apiRsaSn: d6b939ec8c34e8e1a4de6ec47387e73d
     apiRsaKeyPath: XX
     apiRsaKey: MIIEpQIBAAKCAQEAzz+6y/ZH3ZTfpeUmFU5LHrNhdW8WtHWRcTr6mu10Cts++lu3b24wxRJHMdfilqHIGEoSB23Hj2T42exhdZXd1Ye00ibUXDQNCqhcjU4rq41XZh2k1jmtFtnV2SfQvsgjZxIEdtf5iefterbHZCNsNOh+Mb4E/cGyRUtyKtCbbcybSSk3gcYlsDfUjk5R6Vk0lrtDUcMKqVyADOCJ2GWf876VXvn6Xujvw1maFjQhEhPDAIhykFOPR8WfH3LzPZ+pZPmyzupJ109veAfcGraES1iozcCpyqBcAJ3No0N4szfUzHKDICMs2roxeLP7Wk+qx5eCWzcd/Ps17lmrme9aVwIDAQABAoIBAQCznQnpBpKWCRYjEouE34vfGZuXSSWmVFYuiezzJGPznLviAmbh3d/Ki+LD4dPwtFlUI62oXo4bSmkZhPGaFL5i9u/RSfG1zy6WU/+SP3M9hIuAZqSbPPUz3qqlPwp8rbtw8n6H+Pm9eRGpzorT0JdQ60WjGon82kgEIjTZwl1SM/fzCGB12mVB2q9SoheNMyRaUxa3LGQf73XVnmZ/er2bou4z/FiC3JYTaIZgRxVEwuHCtMpDi4TQg0ew4RB1h0H9LQhQ7WtBRYBQIFqDHKep3Lm0J83RHxIerpXsFzN6Bg6GyFg0XdJzLJSlI7Ecftrge/pSHKf/VjwLu5AhitURAoGBAOsISjr98c9UGTGwR24Z6HIZOOerwgbl7WcyW8eFMh37OFYvBRADm8Hime/ASIj4EIcirJ0CbatF7IuNZFLYM0REjfz7Ge9DIVx67LYtQTBQekLdFx8mQuy1ixmSgFdQV4NlKgw2Aa9Vj0ZeZcWm4EItRQmYJEdmFpbWPrQztuE9AoGBAOG86rB6OanJeUCvfPpLoPY1Uwu1IlgXd9VEi4BXEmJGQx4HOicgVVVAuzjlD/pzDmQuT03ncGUzlHnWlMp2tt18J9x0TGjBX/GXjklGg+2Jt90UV+8vPKJ/BRbC2H8ae9Ks2i/XgcdKILAWM9LP5NCkGVNn6mGQgoLxPKv/c7sjAoGBALi9HmO6Iax+hQMadTrkoGG205S929fCONWprpxoZJlOUtzjPo5016QRckASGrGWkp81sQoE06ERaDnU3GuFxt49KIIV+S+oy3s+n/seHSRVzZPq5na0g1w94mUqUzjOTMtZ5DAO70oa7XA5WLOAVLuPi7lb3gBFDTJomobYM0JdAoGATQ1RBoAR4rSUoNHF1SGvhZraB+sCGBOaob9N5rbR3Z2iF0PcQ7Kzre/0eA0oERLo3KU6CJtxL/oVOilWjG1NKfjRGlzQIAmxmCNlO/nH2nLhwaLKCSiUh9rXf9duUqRVk6nQp/flooLY+YH6moC/17/LrT6RMFBFXDC/xu3hMQUCgYEAmtHGZX6PR/nLtmrMBzEkY2d8aDXYhrACzQVA5HrPnd8i64G+Q4lP05jzfFpDgcOaJA7eV2Z8fckNdpECRNRl29w29GvN921g+QHKUdJAi5TktnCPbqjw7z5j28CiWPHg6ksR2lr2iXuJLnidun2zZDn/jzGiNo8tTOYqkDTCeA8=
 

yiqi-core/src/main/java/com/yiqi/order/service/impl/OrderClothServiceImpl.java

@@ -737,7 +737,7 @@ public class OrderClothServiceImpl extends ServiceImpl<OrderClothMapper, OrderCl
             }
         }
         // 上门取衣（配送上门）-计算取衣配送费
-        if (orderCloth.getSendClothWay().equals(TakeOrSendClothWay.DELIVERY.getCode())) {
+        if (orderCloth.getSendClothWay() != null && orderCloth.getSendClothWay().equals(TakeOrSendClothWay.DELIVERY.getCode())) {
             if (freeDeliveryNum > 0) {
                 freeDeliveryNum--;
             } else {