fix：修复订单支付商品名称

src/main/java/com/szwl/constant/HuifuConstant.java

@@ -70,14 +70,14 @@ public class HuifuConstant {
      * 跳转链接
      */
     public final static String JUMP_URL = "http://szwlh.sunzee.com.cn/shenze";
-//    public final static String JUMP_URL = ""http://szwltest.sunzee.com.cn/shenze";
+//    public final static String JUMP_URL = "http://szwltest.sunzee.com.cn/shenze";
 
 
     /**
      *  支付成功回调
      */
-//    public final static String Notify_Url = "http://szwltest.sunzee.com.cn:49002/PAY-SERVER/tOrder/huifuNotify";
-    public final static String Notify_Url = "https://sz.sunzee.com.cn/PAY-SERVER/tOrder/huifuNotify";
+    public final static String Notify_Url = "http://szwltest.sunzee.com.cn:49002/PAY-SERVER/tOrder/huifuNotify";
+//    public final static String Notify_Url = "https://sz.sunzee.com.cn/PAY-SERVER/tOrder/huifuNotify";
 
     public final static String mg280Notify_Url = "https://sz.sunzee.com.cn/PAY-SERVER/tOrder/mg280Notify";
 

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

@@ -1251,10 +1251,14 @@ public class TOrderController {
 
         String client6 = clientId.substring(clientId.length() - 6);
         String productName1 = "";
-        if(equipment.getMachineType() == null || equipment.getMachineType().equals("0")) {
-            productName1 = "棉花糖-" + equipment.getName() + "-" + client6;
+        if(productNumber > 1) {
+            if(equipment.getMachineType() == null || equipment.getMachineType().equals("0")) {
+                productName1 = "棉花糖-" + equipment.getName() + "-" + client6;
+            } else {
+                productName1 = "爆米花-" + equipment.getName() + "-" + client6;
+            }
         } else {
-            productName1 = "爆米花-" + equipment.getName() + "-" + client6;
+            productName1 = productName + "-" + equipment.getName() + "-" + client6;
         }
         String result = null;
         if(StringUtils.isNotEmpty(payPlatform)&&payPlatform.equals("1")){
@@ -1727,10 +1731,14 @@ public class TOrderController {
 
         String client6 = clientId.substring(clientId.length() - 6);
         String productName1 = "";
-        if(equipment.getMachineType() == null || equipment.getMachineType().equals("0")) {
-            productName1 = "棉花糖-" + equipment.getName() + "-" + client6;
+        if(productNumber > 1) {
+            if(equipment.getMachineType() == null || equipment.getMachineType().equals("0")) {
+                productName1 = "棉花糖-" + equipment.getName() + "-" + client6;
+            } else {
+                productName1 = "爆米花-" + equipment.getName() + "-" + client6;
+            }
         } else {
-            productName1 = "爆米花-" + equipment.getName() + "-" + client6;
+            productName1 = productName + "-" + equipment.getName() + "-" + client6;
         }
         String result = null;
         if(StringUtils.isNotEmpty(payPlatform)&&payPlatform.equals("1")){