fix："优化修改机器密码功能"

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

@@ -823,113 +823,6 @@ public class IndexController {
         }
     }
 
-    private void saveProductMG22(Long id) {
-        String[] str = {"玫瑰精灵-A01", "童心未泯-A02", "五彩缤纷-A03", "天雪恋舞-A04", "水中芙蓉-A05", "烈焰红唇-A06", "美梦成真-A07", "一见钟情-A08", "幽兰爱恋-A09", "心之守护-A10",
-                "夏日爱恋-A11", "冰美人-A12", "国色天香-A13", "赤子之心-A14", "海洋之心-A15", "水晶之恋-A16", "彩色精灵-A17", "小棉袄-A18", "精灵蝶梦-A19", "蜂缠蝶恋-A22", "坠入星空-A25", "花飞蝶舞-A28"};
-
-        for (int i = 0; i < str.length; i++) {
-            TProduct product = new TProduct();
-            product.setCreateDate(new Date());
-            product.setModifyDate(new Date());
-            product.setEquipmentId(id);
-            String[] split = str[i].split("-");
-            product.setProductName(split[0]);
-            product.setNo(split[1]);
-            product.setRmbPrice(new BigDecimal(0.01));
-            product.setCodePrice(new BigDecimal(0.01));
-            productService.save(product);
-        }
-
-    }
-
-    private void saveProductMG26(Long id) {
-        String[] str = {"玫瑰精灵-A01", "童心未泯-A02", "五彩缤纷-A03", "天雪恋舞-A04", "水中芙蓉-A05", "烈焰红唇-A06", "美梦成真-A07", "一见钟情-A08", "幽兰爱恋-A09", "心之守护-A10",
-                "夏日爱恋-A11", "冰美人-A12", "国色天香-A13", "赤子之心-A14", "海洋之心-A15", "水晶之恋-A16", "彩色精灵-A17", "小棉袄-A18", "精灵蝶梦-A19", "蜂缠蝶恋-A22", "坠入星空-A25", "花飞蝶舞-A28",
-                "夏日倾城-A20", "雪花飞舞-A26", "豆蔻年华-A23", "花样年华-A29"};
-        for (int i = 0; i < str.length; i++) {
-            TProduct product = new TProduct();
-            product.setCreateDate(new Date());
-            product.setModifyDate(new Date());
-            product.setEquipmentId(id);
-            String[] split = str[i].split("-");
-            product.setProductName(split[0]);
-            product.setNo(split[1]);
-            product.setRmbPrice(new BigDecimal(0.01));
-            product.setCodePrice(new BigDecimal(0.01));
-            productService.save(product);
-        }
-
-    }
-
-    private void saveProductMG42(Long id) {
-        String[] str = {"玫瑰精灵-A01", "童心未泯-A02", "五彩缤纷-A03", "天雪恋舞-A04", "水中芙蓉-A05", "烈焰红唇-A06", "美梦成真-A07", "一见钟情-A08", "幽兰爱恋-A09",
-                "心之守护-A10", "夏日爱恋-A11", "冰美人-A12", "国色天香-A13", "赤子之心-A14", "海洋之心-A15", "水晶之恋-A16", "彩色精灵-A17", "小棉袄-A18",
-                "精灵蝶梦-A19", "夏日倾城-A20", "百花齐放-A21", "蜂缠蝶恋-A22", "豆蔻年华-A23", "星空幻想-A24", "坠入星空-A25", "雪花飞舞-A26", "春暖花开-A27", "花飞蝶舞-A28",
-                "花样年华-A29", "心花怒放-A30", "花好月圆-A37", "出水芙蓉-A38", "微光染晕-A39", "夏日莓莓-A40", "芳楚纷飞-A41", "晨夕光晕-A42", "坠入爱河-A43", "天马行空-A44",
-                "灼灼其华-A45", "一帘幽梦-A46", "七月初夏-A47", "四月微风-A48"};
-        for (int i = 0; i < str.length; i++) {
-            TProduct product = new TProduct();
-            product.setCreateDate(new Date());
-            product.setModifyDate(new Date());
-            product.setEquipmentId(id);
-            String[] split = str[i].split("-");
-            product.setProductName(split[0]);
-            product.setNo(split[1]);
-            product.setRmbPrice(new BigDecimal(0.01));
-            product.setCodePrice(new BigDecimal(0.01));
-            productService.save(product);
-        }
-
-    }
-
-    /**
-     * 添加爆米花产品
-     *
-     * @param id
-     */
-    private void saveProductP30(Long id) {
-        String[] str = {"活力爆米花(正常糖)-B01", "活力爆米花(无糖)-B02", "活力爆米花(巧克力)-B03", "活力爆米花(焦糖)-B04", "活力爆米花(水蜜桃)-B05", "活力爆米花(蓝莓)-B06"};
-
-        for (int i = 0; i < str.length; i++) {
-            TProduct product = new TProduct();
-            product.setCreateDate(new Date());
-            product.setModifyDate(new Date());
-            product.setEquipmentId(id);
-            String[] split = str[i].split("-");
-            product.setProductName(split[0]);
-            product.setNo(split[1]);
-            product.setRmbPrice(new BigDecimal(0.01));
-            product.setCodePrice(new BigDecimal(0.01));
-            productService.save(product);
-        }
-    }
-
-    /**
-     * 添加冰淇淋产品
-     *
-     * @param id
-     */
-    private void saveProductSI320(Long id) {
-        LambdaQueryWrapper<TGoodsData> wrapper = Wrappers.lambdaQuery();
-        wrapper.eq(TGoodsData::getNumber, 6);
-        wrapper.eq(TGoodsData::getMachineType, "2");
-        TGoodsData goodsData = goodsDataService.getOne(wrapper);
-        String goods = goodsData.getGoods();
-        String[] str = goods.split(",");
-
-        for (int i = 0; i < str.length; i++) {
-            TProduct product = new TProduct();
-            product.setCreateDate(new Date());
-            product.setModifyDate(new Date());
-            product.setEquipmentId(id);
-            String[] split = str[i].split("-");
-            product.setProductName(split[0]);
-            product.setNo(split[1]);
-            product.setRmbPrice(new BigDecimal(0.01));
-            product.setCodePrice(new BigDecimal(0.01));
-            productService.save(product);
-        }
-    }
 
     /**
      * 获取指定日期所在月份开始的时间戳
@@ -1116,14 +1009,6 @@ public class IndexController {
         return "调价成功";
     }
 
-    public Double tran(Double d) {
-        return new BigDecimal(d).setScale(4, BigDecimal.ROUND_HALF_UP).doubleValue();
-    }
-
-    public Double tran2(Double d) {
-        return new BigDecimal(d).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
-    }
-
     /**
      * 密码修改
      *

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

@@ -1229,6 +1229,7 @@ public class TEquipmentController {
                 tEquipmentService.sendRemoteMessage(equipment.getClientId(), OperationType.PASSWORD, message, adminId);
                 // MQ消息
                 tEquipmentService.sentMessage(equipment.getClientId(), PushUtils.buildJson("guestPwd", guestPwd).toString());
+                equipment.setGuestPwd(guestPwd);
             }
             if (StringUtils.isNotEmpty(adminPwd)) {
                 kindData.put("type", "0");
@@ -1238,7 +1239,9 @@ public class TEquipmentController {
                 tEquipmentService.sendRemoteMessage(equipment.getClientId(), OperationType.PASSWORD, message, adminId);
                 // MQ消息
                 tEquipmentService.sentMessage(equipment.getClientId(), PushUtils.buildJson("adminPwd", adminPwd).toString());
+                equipment.setAdminPwd(adminPwd);
             }
+            tEquipmentService.updateById(equipment);
             return R.ok();
         }
         return R.fail(ResponseCodesEnum.A0001, "找不到设备");

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

@@ -286,7 +286,6 @@ public class TOrderController {
                         String phone = admin.getPhone();
                         if (StringUtils.isNotEmpty(phone)) {
                             String sendResult = orderService.sendRefundSms(order, phone, name);
-//                            log.info("退款短信发送结果：{}", sendResult);
                         }
                     }
                     order.setRefundTrxNo(String.valueOf(refusePrice));