app开发

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

@@ -125,6 +125,7 @@ public class PackageUpgradeController extends BaseController {
                 wrapper2.eq("name", packageUpgrade.get(0).get("wxcl"));
                 List<Package> packages2 = packageMapper.selectList(wrapper2);
                 Map<String, Object> map = packageUpgrade.get(0);
+                map.remove("social_id");
                 map.put("newPackage", packages1.get(0));
                 map.put("oldPackage", packages2.get(0));
                 return ResponseData.success(map);
@@ -172,7 +173,6 @@ public class PackageUpgradeController extends BaseController {
      * @param is_yct
      * @param mark
      * @param addRess
-     * @param idCard
      * @param custName
      * @param userSchool
      * @return
@@ -184,7 +184,7 @@ public class PackageUpgradeController extends BaseController {
             , @RequestParam("nowPackage") String nowPackage, @RequestParam("partner") String partner
             , @RequestParam("businessPackage") String businessPackage, @RequestParam(value = "is_yct", required = false) String is_yct
             , @RequestParam(value = "mark", required = false) String mark, @RequestParam(value = "addRess", required = false) String addRess
-            , @RequestParam(value = "idCard", required = false) String idCard,@RequestParam(value = "custName", required = false) String custName
+            , @RequestParam(value = "servId") String servId,@RequestParam(value = "custName", required = false) String custName
             , @RequestParam(value = "userSchool", required = false) String userSchool) {
 
         Wrapper<Order> wrapper = new EntityWrapper();
@@ -194,11 +194,12 @@ public class PackageUpgradeController extends BaseController {
         if(orders.size() != 0){
             return ResponseData.error("升级订单已存在，不可重复申请！");
         }
+        PackageUpgrade packageUpgrade = packageUpgradeMapper.selectById(servId);
         SysUser sysUser = userMapper.selectById(partner);
         Order order = new Order();
         String id = UUID.randomUUID().toString();
         order.setId(id);
-        order.setIdCard(idCard);
+        order.setIdCard(packageUpgrade.getSocialId());
         order.setOrderStatus(OrderStatus.PENDINGACCEPTANCE.getName());
         order.setHehuorenId(partner);
         order.setPackageId(cardId);
@@ -256,6 +257,12 @@ public class PackageUpgradeController extends BaseController {
     @RequestMapping(value = "selectOrderInfo", method = RequestMethod.POST)
     public ResponseData<Order> selectOrderInfo(@RequestParam("orderId") String orderId) {
         Order order = orderMapper.selectById(orderId);
+        order.setIdCard("");
+        order.setIdCardf("");
+        order.setIdCardz("");
+        order.setIdCardzs("");
+        order.setGiftAccount("");
+        order.setGiftPassword("");
         return ResponseData.success(order);
     }
 
@@ -263,9 +270,16 @@ public class PackageUpgradeController extends BaseController {
      * 查询用户详情
      */
     @RequestMapping(value = "selectUserInfo", method = RequestMethod.POST)
-    public ResponseData<SysUser> selectUserInfo(@RequestParam("partner") String partner) {
+    public ResponseData<Map<String, Object>> selectUserInfo(@RequestParam("partner") String partner) {
         SysUser sysUser = userMapper.selectById(partner);
-        return ResponseData.success(sysUser);
+        String school = packageUpgradeMapper.selectShoolByUserId(partner);
+        Map<String, Object> map = new HashMap<>();
+        map.put("school",school);
+        map.put("name",sysUser.getName());
+        map.put("id",sysUser.getId());
+        map.put("account",sysUser.getAccount());
+        map.put("phone",sysUser.getPhone());
+        return ResponseData.success(map);
     }
 
     /**