fix：“优化退款功能“

src/main/java/com/szwl/controller/TOrderController.java

@@ -220,8 +220,9 @@ public class TOrderController {
                     payFeign.updateOrder(order);
                     // 修改订单明细
                     for (TOrderDetails orderDetail : orderDetails) {
-                        String productNo = orderDetail.getProductNo();
-                        Integer productNumber = refundMap.get(productNo);
+//                        String productNo = orderDetail.getProductNo();
+                        String orderDetailId = orderDetail.getId();
+                        Integer productNumber = refundMap.get(orderDetailId);
                         if(productNumber != null && orderDetail.getAmount().compareTo(BigDecimal.ZERO) > 0) {
                             // 退款中
                             orderDetail.setRefundStatus("4");
@@ -255,9 +256,10 @@ public class TOrderController {
                     }
                     // 修改订单明细
                     for (TOrderDetails orderDetail : orderDetails) {
-                        String productNo = orderDetail.getProductNo();
-                        Integer productNumber = refundMap.get(productNo);
-                        if(productNumber != null && orderDetail.getAmount().compareTo(BigDecimal.ZERO)  > 0) {
+//                        String productNo = orderDetail.getProductNo();
+                        String orderDetailId = orderDetail.getId();
+                        Integer productNumber = refundMap.get(orderDetailId);
+                        if(productNumber != null && orderDetail.getAmount().compareTo(BigDecimal.ZERO) > 0) {
                             // 退款中
                             orderDetail.setRefundStatus("4");
                             // 退款数量

src/main/java/com/szwl/service/impl/TEquipmentServiceImpl.java

@@ -289,21 +289,27 @@ public class TEquipmentServiceImpl extends ServiceImpl<TEquipmentMapper, TEquipm
                         LambdaQueryWrapper<TWechat> wechatQuery = Wrappers.lambdaQuery();
                         wechatQuery.eq(TWechat::getAdminId, equipment.getAdminId());
                         TWechat wechat = wechatService.getOne(wechatQuery);
+                        // 设备名称
+                        String name = equipment.getName();
+                        // 如果为空就拿设备编号后六位
+                        if(StringUtils.isEmpty(name)) {
+                            name = equipment.getClientId().substring(equipment.getClientId().length() - 6);
+                        }
                         if(wechat != null) {
                             // 有绑定微信的话发公众号
                             String openId = wechat.getOpenId();
-                            wechatService.sendNoworkMessage(openId,equipment.getClientId(),equipment.getName(), ifForeign, companyType);
+                            wechatService.sendNoworkMessage(openId,equipment.getClientId(),name, ifForeign, companyType);
                             if (ifForeign.equals("1")) {
                                 // 国外再发邮件
                                 String messageReceiver = equipment.getMessageReceiver();
                                 if(StringUtils.isNotEmpty(messageReceiver)) {
                                     String[] split = messageReceiver.split(",");
                                     for (String s : split) {
-                                        WechatSendUtil.sentEmail(s,equipment.getName());
+                                        WechatSendUtil.sentEmail(s, name);
                                     }
                                 } else {
                                     if(StringUtils.isNotEmpty(admin.getEmail())){
-                                        WechatSendUtil.sentEmail(admin.getEmail(),equipment.getName());
+                                        WechatSendUtil.sentEmail(admin.getEmail(), name);
                                     }
                                 }
                             }
@@ -317,11 +323,11 @@ public class TEquipmentServiceImpl extends ServiceImpl<TEquipmentMapper, TEquipm
                                 if(StringUtils.isNotEmpty(messageReceiver)) {
                                     String[] split = messageReceiver.split(",");
                                     for (String s : split) {
-                                        WechatSendUtil.sentEmail(s,equipment.getName());
+                                        WechatSendUtil.sentEmail(s, name);
                                     }
                                 } else {
                                     if(StringUtils.isNotEmpty(admin.getEmail())){
-                                        WechatSendUtil.sentEmail(admin.getEmail(),equipment.getName());
+                                        WechatSendUtil.sentEmail(admin.getEmail(), name);
                                     }
                                 }