订单同步机具券关联订单ID

kxs-transfer/src/main/java/com/kxs/transfer/api/service/product/impl/KxsShopOrderService.java

@@ -69,8 +69,10 @@ public class KxsShopOrderService extends ServiceImpl<KxsShopOrderMapper, KxsShop
                     for (int i = 0; i < kxsMachineApplyDetails.size(); i++) {
                         kxsMachineApplyDetails.get(i).setPosSn(split[i]);
                         KxsMachine kxsMachine = kxsMachineMapper.selectOne(Wrappers.<KxsMachine>lambdaQuery().eq(KxsMachine::getPosSn, split[i]));
-                        kxsMachineApplyDetails.get(i).setMachineId(kxsMachine.getId());
-                        kxsMachineApplyDetailMapper.updateById(kxsMachineApplyDetails.get(i));
+                        if(kxsMachine != null){
+                            kxsMachineApplyDetails.get(i).setMachineId(kxsMachine.getId());
+                            kxsMachineApplyDetailMapper.updateById(kxsMachineApplyDetails.get(i));
+                        }
                     }
                 }
             }
@@ -79,7 +81,8 @@ public class KxsShopOrderService extends ServiceImpl<KxsShopOrderMapper, KxsShop
             //机具券订单
             if(fieldDataMap.get("SnNos").getValue() != null){
                 String sns = fieldDataMap.get("SnNos").getValue().toString();
-                List<KxsTicket> kxsTickets = kxsTicketMapper.selectList(Wrappers.<KxsTicket>lambdaQuery().in(KxsTicket::getTicketCode, sns));
+                String[] split = sns.split(StrUtil.COMMA);
+                List<KxsTicket> kxsTickets = kxsTicketMapper.selectList(Wrappers.<KxsTicket>lambdaQuery().in(KxsTicket::getTicketCode, split));
                 if(kxsTickets != null){
                     for (KxsTicket kxsTicket : kxsTickets) {
                         kxsTicket.setOrderId(Integer.valueOf(dmlData.getId()));