方案列表专业序号

wisenergy-mapper/src/main/resources/mapper/VolunteerMapper.xml

@@ -133,7 +133,7 @@
 
     <select id="getListByIds" resultType="cn.wisenergy.model.app.Volunteer">
         select
-        id, type,scheme_id,substring(major_name,3) major_name,academy, course_demand,nature,year_limit,plan_num,
+        id, type,scheme_id,major_name,academy, course_demand,nature,year_limit,plan_num,
         cast_archives_num,launch_num,lowest_mark, lowest_rank,is_delete,create_time,update_time
         from
         <include refid="table"/>

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserLoginServiceImpl.java

@@ -354,5 +354,9 @@ public class UserLoginServiceImpl extends ServiceImpl<UsersMapper, User> impleme
         return true;
     }
 
+    public static void main(String[] args) {
+        String psd=Md5Util.digestMD5("123456"+"13000001055");
+        System.out.println(psd);
+    }
 
 }

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserServiceImpl.java

@@ -212,7 +212,8 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
         if (null == user) {
             return R.error("用户信息不存在!");
         }
-        if(!StringUtils.isBlank(userDto.getVipMobile()) && !getUserInfo(userDto.getVipMobile())){
+
+        if(!StringUtils.isBlank(userDto.getVipMobile()) && !getUserInfo(userDto.getVipMobile(),userDto.getUserId())){
             return R.error("该电话已存在");
         }
 
@@ -248,11 +249,6 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
         scoreInfo.setMathGrade(userDto.getScoreInfo().getMathGrade());
         scoreInfo.setPhysicsGrade(userDto.getScoreInfo().getPhysicsGrade());
         scoreInfo.setPoliticsGrade(userDto.getScoreInfo().getPoliticsGrade());
-        if(StringUtils.isBlank(userDto.getScoreInfo().getRanking())){
-            scoreInfo.setRanking("0");
-        }else{
-            scoreInfo.setRanking(userDto.getScoreInfo().getRanking());
-        }
 
 
         //4、更新用户信息和保存用户成绩
@@ -564,15 +560,15 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
         return R.ok(userKnownDto);
     }
 
-    public boolean getUserInfo(String vipMobile){
+    public boolean getUserInfo(String vipMobile,Integer userId){
         Map<String, Object> map = new HashMap<>(16);
         map.put("vip_mobile",vipMobile);
         User user = usersMapper.selectOne(map);
-        if(null == user){
-            return true;
-        }
+        if(null != user && !user.getId().equals(userId)){
             return false;
         }
+        return true;
+    }
 
 }
 

wisenergy-service/src/main/java/cn/wisenergy/service/common/Common.java

@@ -39,24 +39,24 @@ public class Common {
      * 支付宝--回调地址
      */
     //测试
-    //public static final String NOTIFY_URL = "http://111.203.232.171:8997/pay/aliPayCallBack.do";
+    public static final String NOTIFY_URL = "http://111.203.232.171:8997/pay/aliPayCallBack.do";
     //线上
-    public static final String NOTIFY_URL = "https://jygkzy.com/api/pay/aliPayCallBack.do";
+    //public static final String NOTIFY_URL = "https://jygkzy.com/api/pay/aliPayCallBack.do";
 
     /***
      * 支付宝--pc端支付成功跳转地址
      */
     //测试
-    //public static final String RETURN_URL_PC = "http://111.203.232.171:8999/#/wallet";
+    public static final String RETURN_URL_PC = "http://111.203.232.171:8999/#/wallet";
     //线上
-    public static final String RETURN_URL_PC = "https://jygkzy.com/#/wallet";
+    //public static final String RETURN_URL_PC = "https://jygkzy.com/#/wallet";
     /***
      * 支付宝--手机网页支付成功跳转地址
      */
     //测试
-    //public static final String RETURN_URL_WAP = "http://111.203.232.171:8999/#/history";
+    public static final String RETURN_URL_WAP = "http://111.203.232.171:8999/#/history";
     //线上
-    public static final String RETURN_URL_WAP = "https://jygkzy.com/#/history";
+    //public static final String RETURN_URL_WAP = "https://jygkzy.com/#/history";
 
 
     /**

wisenergy-service/src/main/java/cn/wisenergy/service/wxpay/WxCommon.java

@@ -9,9 +9,9 @@ package cn.wisenergy.service.wxpay;
 public class WxCommon {
 
     //测试
-    //public static final String NOTIFY_URL = "http://111.203.232.171:8997/pay/wxPayCallBack.do";
+    public static final String NOTIFY_URL = "http://111.203.232.171:8997/pay/wxPayCallBack.do";
     //线上
-    public static final String NOTIFY_URL = "https://jygkzy.com/api/pay/wxPayCallBack.do";
+    //public static final String NOTIFY_URL = "https://jygkzy.com/api/pay/wxPayCallBack.do";
 
 
 

wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/UserController.java

@@ -23,6 +23,8 @@ import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
+import java.util.HashMap;
+import java.util.LinkedList;
 import java.util.List;
 
 
@@ -207,9 +209,9 @@ public class UserController {
         return userService.getUserKnown();
     }
 
-    @ApiOperation(value = "jenkins测试",notes = "jenkins测试",httpMethod = "POST")
+   /* @ApiOperation(value = "jenkins测试",notes = "jenkins测试",httpMethod = "POST")
     @PostMapping("/jenkins")
     public boolean jenkins(){
         return true;
-    }
+    }*/
 }

wisenergy-web-admin/src/main/resources/application-dev.yml

@@ -3,8 +3,8 @@ spring:
     type: com.alibaba.druid.pool.DruidDataSource
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver
-      #url: jdbc:mysql://192.168.110.165:3306/volunteer?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8&useSSL=false&serverTimezone=UTC
-      url: jdbc:mysql://localhost:3306/volunteer?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8&useSSL=false&serverTimezone=UTC
+      url: jdbc:mysql://192.168.110.165:3306/volunteer?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8&useSSL=false&serverTimezone=Asia/Shanghai
+      #url: jdbc:mysql://localhost:3306/volunteer?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8&useSSL=false&serverTimezone=Asia/Shanghai
       #url: jdbc:mysql://rm-bp1i44rtb091fk06coo.mysql.rds.aliyuncs.com:3306/volunteer?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai&useSSL=false
       username: root
       password: adm4HYservice$

wisenergy-web-admin/src/main/resources/application.yml

@@ -4,8 +4,8 @@ server:
     max-threads: 1000
     min-spare-threads: 30
 
-  #port: 8997
-  port: 8080
+  port: 8997
+  #port: 8080
   connection-timeout: 5000ms
 
 spring: