app开发bug修复

apply-net/src/main/java/com/winsun/controller/PackageUpgradeController.java

@@ -137,12 +137,12 @@ public class PackageUpgradeController extends BaseController {
                 wrapper2.eq("package_name ", packageUpgrade.get(0).get("wxcl"));
                 wrapper2.eq("package_name ", packageUpgrade.get(0).get("wxcl"));
                 List<Package> packages2 = packageMapper.selectList(wrapper2);
                 List<Package> packages2 = packageMapper.selectList(wrapper2);
                 if (packages2.size() == 0) {
                 if (packages2.size() == 0) {
-                    return ResponseData.error("您没有升级套餐！");
+                    return ResponseData.error("您没有升级套餐");
                 }
                 }
                 Map<String, Object> map = packageUpgrade.get(0);
                 Map<String, Object> map = packageUpgrade.get(0);
                 map.remove("social_id");
                 map.remove("social_id");
-                map.put("newPackage", packages1.get(0));
-                map.put("oldPackage", packages2.get(0));
+                map.put("oldPackage", packages1.get(0));
+                map.put("newPackage", packages2.get(0));
                 return ResponseData.success(map);
                 return ResponseData.success(map);
             }
             }
             if (selectOrder.length() == 18) {
             if (selectOrder.length() == 18) {
@@ -153,11 +153,11 @@ public class PackageUpgradeController extends BaseController {
                 wrapper2.eq("package_name ", packageUpgrade.get(0).get("wxcl"));
                 wrapper2.eq("package_name ", packageUpgrade.get(0).get("wxcl"));
                 List<Package> packages2 = packageMapper.selectList(wrapper2);
                 List<Package> packages2 = packageMapper.selectList(wrapper2);
                 if (packages2.size() == 0) {
                 if (packages2.size() == 0) {
-                    return ResponseData.error("您没有升级套餐！");
+                    return ResponseData.error("您没有升级套餐");
                 }
                 }
                 Map<String, Object> map = packageUpgrade.get(0);
                 Map<String, Object> map = packageUpgrade.get(0);
-                map.put("newPackage", packages1.get(0));
-                map.put("oldPackage", packages2.get(0));
+                map.put("oldPackage", packages1.get(0));
+                map.put("newPackage", packages2.get(0));
                 return ResponseData.success(map);
                 return ResponseData.success(map);
             }
             }
             if (selectOrder.length() == 11) {
             if (selectOrder.length() == 11) {
@@ -168,15 +168,15 @@ public class PackageUpgradeController extends BaseController {
                 wrapper2.eq("package_name ", packageUpgrade.get(0).get("wxcl"));
                 wrapper2.eq("package_name ", packageUpgrade.get(0).get("wxcl"));
                 List<Package> packages2 = packageMapper.selectList(wrapper2);
                 List<Package> packages2 = packageMapper.selectList(wrapper2);
                 if (packages2.size() == 0) {
                 if (packages2.size() == 0) {
-                    return ResponseData.error("您没有升级套餐！");
+                    return ResponseData.error("您没有升级套餐");
                 }
                 }
                 Map<String, Object> map = packageUpgrade.get(0);
                 Map<String, Object> map = packageUpgrade.get(0);
-                map.put("newPackage", packages1.get(0));
-                map.put("oldPackage", packages2.get(0));
+                map.put("oldPackage", packages1.get(0));
+                map.put("newPackage", packages2.get(0));
                 return ResponseData.success(map);
                 return ResponseData.success(map);
             }
             }
         }
         }
-        return ResponseData.error("验证码有误！");
+        return ResponseData.error("验证码有误");
     }
     }
 
 
     /**
     /**
@@ -214,12 +214,11 @@ public class PackageUpgradeController extends BaseController {
             return ResponseData.error("联系号码有误，请重新输入");
             return ResponseData.error("联系号码有误，请重新输入");
         }
         }
         Wrapper<Order> wrapper = new EntityWrapper();
         Wrapper<Order> wrapper = new EntityWrapper();
-        wrapper.eq("hehuoren_id", partner);
         wrapper.eq("business_number", businessNumber);
         wrapper.eq("business_number", businessNumber);
         wrapper.eq("user_type", UserType.OLDCUSTOMER.getId());
         wrapper.eq("user_type", UserType.OLDCUSTOMER.getId());
         List<Order> orders = orderMapper.selectList(wrapper);
         List<Order> orders = orderMapper.selectList(wrapper);
         if (orders.size() != 0) {
         if (orders.size() != 0) {
-            return ResponseData.error("升级订单已存在，不可重复申请！");
+            return ResponseData.error("套餐升级订单已存在，请不要重复申请！");
         }
         }
         PackageUpgrade packageUpgrade = packageUpgradeMapper.selectById(servId);
         PackageUpgrade packageUpgrade = packageUpgradeMapper.selectById(servId);
         SysUser sysUser = userMapper.selectById(partner);
         SysUser sysUser = userMapper.selectById(partner);