修改添加点数接口

wisenergy-model/src/main/java/cn/wisenergy/model/app/User.java

 package cn.wisenergy.model.app;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -125,36 +126,42 @@ public class User implements Serializable {
     /**
      * 文化成绩
      */
+    @TableField(exist = false)
     @Transient
     private String cultureGrade;
 
     /**
      * 专业成绩
      */
+    @TableField(exist = false)
     @Transient
     private String majorGrade;
 
     /**
      * 专业成绩
      */
+    @TableField(exist = false)
     @Transient
     private Integer usableLimit;
 
     /**
      * 充值类型 1：支付宝 2：微信 3：充值卡
      */
+    @TableField(exist = false)
     @Transient
     private String type;
 
     /**
      * 充值金额
      */
+    @TableField(exist = false)
     @Transient
     private String money;
 
     /**
      * 员工名称
      */
+    @TableField(exist = false)
     @Transient
     private String staffName;
 

wisenergy-service/src/main/java/cn/wisenergy/service/app/UserLimitService.java

@@ -46,9 +46,9 @@ public interface UserLimitService {
 
     /**
      * 给用户添加查询点数
-     * @param phone
+     * @param userId
      * @param number
      * @return
      */
-    R<Boolean> addPoint(String phone,Integer number);
+    R<Boolean> addPoint(Integer userId,Integer number);
 }

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

@@ -54,6 +54,18 @@ public class AliPayServiceImpl implements AliPayService {
     @Value("${aliPay.PRIVATE_KEY}")
     private String PRIVATE_KEY;
 
+    //支付宝手机网页支付成功跳转地址
+    @Value("${aliPay.RETURN_URL_WAP}")
+    private String RETURN_URL_WAP;
+
+    //支付宝pc端支付成功跳转地址
+    @Value("${aliPay.RETURN_URL_PC}")
+    private String RETURN_URL_PC;
+
+    //支付宝回调地址
+    @Value("${aliPay.NOTIFY_URL}")
+    private String NOTIFY_URL;
+
     /***
      * pc端支付宝支付
      */
@@ -68,9 +80,9 @@ public class AliPayServiceImpl implements AliPayService {
         //生成唯一订单号
         String tradeNo = WxPayUtil.getOrderIdByUUId();
         //支付成功跳转地址
-        alipayRequest.setReturnUrl(Common.RETURN_URL_PC);
+        alipayRequest.setReturnUrl(RETURN_URL_PC);
         //支付回调地址
-        alipayRequest.setNotifyUrl(Common.NOTIFY_URL);
+        alipayRequest.setNotifyUrl(NOTIFY_URL);
         alipayRequest.setBizContent("{" +
                 "\"out_trade_no\":\"" + tradeNo + "\"," +
                 "\"total_amount\":" + payPageDto.getTotal() + "," +
@@ -120,9 +132,9 @@ public class AliPayServiceImpl implements AliPayService {
         //生成唯一订单号
         String tradeNo = WxPayUtil.getOrderIdByUUId();
         //支付成功跳转地址
-        alipayRequest.setReturnUrl(Common.RETURN_URL_WAP);
+        alipayRequest.setReturnUrl(RETURN_URL_WAP);
         //支付后回调地址
-        alipayRequest.setNotifyUrl(Common.NOTIFY_URL);
+        alipayRequest.setNotifyUrl(NOTIFY_URL);
         alipayRequest.setBizContent("{" +
                 "\"out_trade_no\":\"" + tradeNo + "\"," +
                 "\"total_amount\":" + payPageDto.getTotal() + "," +

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

@@ -198,13 +198,11 @@ public class UserLimitServiceImpl extends ServiceImpl<UserLimitMapper, UserLimit
     }
 
     @Override
-    public R<Boolean> addPoint(String phone, Integer number) {
-        if(StringUtils.isBlank(phone) || StringUtils.isBlank(number+"")){
+    public R<Boolean> addPoint(Integer userId, Integer number) {
+        if(StringUtils.isBlank(userId+"") || StringUtils.isBlank(number+"")){
             return R.error("入参不能为空!");
         }
-        HashMap<String, Object> map = new HashMap<>();
-        map.put("phone",phone);
-        User userInfo = usersMapper.selectOne(map);
+        User userInfo = usersMapper.selectById(userId);
         if(null == userInfo){
             return R.error("该账号不存在");
         }

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

@@ -59,6 +59,9 @@ public class WxPayServiceImpl implements WxPayService {
     //小程序密钥
     @Value("${wxPay.SECRT_KEY}")
     private String secrt_key;
+    //回调地址
+    @Value("${wxPay.NOTIFY_URL}")
+    private String NOTIFY_URL;
 
 
     /***
@@ -78,7 +81,7 @@ public class WxPayServiceImpl implements WxPayService {
         //生成预支付订单，充值结果设为失败（result=1）
         try {
             //生成【统一下单API】所需参数的接口
-            String orderInfo = WxPayUtil.createOrderInfo(payPageDto, tradeNo, product_id, time_expire, appid, mchid, key);
+            String orderInfo = WxPayUtil.createOrderInfo(payPageDto, tradeNo, product_id, time_expire, appid, mchid, key,NOTIFY_URL);
             log.info("WxPayServiceImpl[]wxPay[]xmlInfo.orderInfo:"+orderInfo);
             //调用统一下单接口
             Map<String, String> map = unifiedOrder(unifiedOrderUrl, orderInfo);
@@ -117,7 +120,7 @@ public class WxPayServiceImpl implements WxPayService {
         //生成预支付订单，充值结果设为失败（result=1）
         try {
             //生成【统一下单API】所需参数的接口
-            String orderInfo = WxPayUtil.createOrderInfoH5(payPageDto, tradeNo, request, appid, mchid, key);
+            String orderInfo = WxPayUtil.createOrderInfoH5(payPageDto, tradeNo, request, appid, mchid, key,NOTIFY_URL);
             log.info("WxPayServiceImpl[]h5WxPay[]xmlInfo.orderInfo:"+orderInfo);
             //调用统一下单接口
             Map<String, String> map = unifiedOrder(unifiedOrderUrl, orderInfo);
@@ -157,7 +160,7 @@ public class WxPayServiceImpl implements WxPayService {
         //生成预支付订单，充值结果设为失败（result=1）
         try {
             //生成【统一下单API】所需参数的接口
-            String orderInfo = WxPayUtil.createOrderInfoWx(payPageDto, tradeNo, nonce_str, Applets_ID, secrt_key, mchid, key);
+            String orderInfo = WxPayUtil.createOrderInfoWx(payPageDto, tradeNo, nonce_str, Applets_ID, secrt_key, mchid, key,NOTIFY_URL);
             log.info("WxPayServiceImpl[]WxPayApplets[]xmlInfo.orderInfo:"+orderInfo);
             //调用统一下单接口
             Map<String, String> map = unifiedOrder(unifiedOrderUrl, orderInfo);

wisenergy-service/src/main/java/cn/wisenergy/service/util/WxPayUtil.java

@@ -16,14 +16,14 @@ public class WxPayUtil {
     /***
      * pc端生成统一下单格式的订单，生成一个XML格式的字符串
      */
-    public static String createOrderInfo(PayPageDto payPageDto,String tradeNo,String product_id,String time_expire,String appid,String mchid,String key) throws UnsupportedEncodingException {
+    public static String createOrderInfo(PayPageDto payPageDto,String tradeNo,String product_id,String time_expire,String appid,String mchid,String key,String NOTIFY_URL) throws UnsupportedEncodingException {
         String nonce_str = RandomStringUtils.randomAlphanumeric(16);
         SortedMap<String,String> parameters = new TreeMap<>();
         parameters.put("appid", appid);
         parameters.put("mch_id",mchid);
         parameters.put("body", "充值");
         parameters.put("out_trade_no",tradeNo);
-        parameters.put("notify_url",WxCommon.NOTIFY_URL);
+        parameters.put("notify_url",NOTIFY_URL);
         DecimalFormat df = new DecimalFormat("#");
         parameters.put("total_fee",  df.format(payPageDto.getTotal()*100));
         parameters.put("nonce_str", nonce_str);
@@ -48,7 +48,7 @@ public class WxPayUtil {
     /***
      * h5生成统一下单格式的订单，生成一个XML格式的字符串
      */
-    public static String createOrderInfoH5(PayPageDto payPageDto,String tradeNo, HttpServletRequest request, String appid, String mchid, String key) {
+    public static String createOrderInfoH5(PayPageDto payPageDto,String tradeNo, HttpServletRequest request, String appid, String mchid, String key,String NOTIFY_URL) {
         String nonce_str = RandomStringUtils.randomAlphanumeric(16);
         String sceneInfo="{'h5_info':{'type':'WAP','wap_url': 'https://jygkzy.com','wap_name': '充值'}}";
         String spbill_create_ip = getRealIp(request);
@@ -60,7 +60,7 @@ public class WxPayUtil {
         parameters.put("nonce_str", nonce_str);
         DecimalFormat df = new DecimalFormat("#");
         parameters.put("total_fee",  df.format(payPageDto.getTotal()*100));
-        parameters.put("notify_url",WxCommon.NOTIFY_URL);
+        parameters.put("notify_url",NOTIFY_URL);
         parameters.put("trade_type","MWEB");
         parameters.put("scene_info",sceneInfo);
         parameters.put("spbill_create_ip",spbill_create_ip);
@@ -81,14 +81,14 @@ public class WxPayUtil {
     /***
      * 小程序生成统一下单格式的订单，生成一个XML格式的字符串
      */
-    public static String createOrderInfoWx(PayPageDto payPageDto,String tradeNo,String nonce_str,String Applets_ID,String secrt_key,String mchid,String key) {
+    public static String createOrderInfoWx(PayPageDto payPageDto,String tradeNo,String nonce_str,String Applets_ID,String secrt_key,String mchid,String key,String NOTIFY_URL) {
         Map<String, Object> infoByCode = WxUtil.getInfoByCode(payPageDto.getCode(), Applets_ID, secrt_key);
         SortedMap<String,String> parameters = new TreeMap<>();
         parameters.put("appid", Applets_ID);
         parameters.put("mch_id", mchid);
         parameters.put("body", "充值");
         parameters.put("out_trade_no", tradeNo);
-        parameters.put("notify_url",WxCommon.NOTIFY_URL);
+        parameters.put("notify_url",NOTIFY_URL);
         parameters.put("nonce_str", nonce_str);
         DecimalFormat df = new DecimalFormat("#");
         parameters.put("total_fee",  df.format(payPageDto.getTotal()*100));

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

@@ -9,6 +9,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.models.auth.In;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -67,13 +68,13 @@ public class UserLimitController {
 
     @ApiOperation(value = "给用户添加查询点数",notes = "给用户添加查询点数",httpMethod = "GET")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "phone",value = "号码",dataType="String"),
+            @ApiImplicitParam(name = "userId",value = "用户id",dataType="int"),
             @ApiImplicitParam(name = "number",value = "充值点数",dataType="int")
     })
     @GetMapping("/addPoint")
-    public R<Boolean> addPoint(String phone,Integer number){
-        log.info("volunteer-service[]UserLimitController[]addPoint[]input.param.phone:"+phone+"number:"+number);
-        return userLimitService.addPoint(phone,number);
+    public R<Boolean> addPoint(Integer userId, Integer number){
+        log.info("volunteer-service[]UserLimitController[]addPoint[]input.param.userId:"+userId+"number:"+number);
+        return userLimitService.addPoint(userId,number);
     }
 
 

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

@@ -74,16 +74,20 @@ jwt:
   expire: 14400
 logging:
   config: classpath:logback-spring.xml
-#支付宝支付appid、支付宝公钥、应用私钥
+#支付宝支付appid、支付宝公钥、应用私钥、手机网页支付成功跳转地址、pc端支付成功跳转地址、回调地址
 aliPay:
   APP_ID: 2021002126609937
   ALIPAY_PUBLIC_KEY: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2cUDFyw7sLpTpICDURNefRfzr7I7qO5Spq6HwdyFbVv5m6wVzt3fXYTcDrVUuzfbV7+rrXqnvk7LNOp10qPtUyHyZKO2jTBBcUK5H0RPNzs1XInKaSTAznGH8dEAk6yQiwhSDpQzwoOq1Ool2MQocdkcBWwAMEcEUByIbJ4ABsrwXdmkgu2hDHR/GgLvarUp1zOXfZkaTK//L1GUI5uCI+/omcqMPDIOwd8DfcNr0TKlXfAEixp9eVuU/b09b7vW7O9Vh+w0gmy5FN+BWX/JaRRL1DhRqbHl7Sl4/oGu1yjfQA5U8jXBgd+QjwdUiAXVwPdESS/AUbPWE517eH5FtQIDAQAB
   PRIVATE_KEY: MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCA9/p6UJH2kpTumbyRt/gdAOUnRJQ0VRQj/o0GtJ9ECweSIk6+8K81CAGcfmdeB6ZfteXZlKr9SGf3hkwuOz5oOJb5GAmKgv60T6zrBm5/MSVYhDY935eCYjFSj59w2120kvtWvq94Km3TkvAstrbSwBgpS4eutZ2qg1U4h5j6H3v+PB6RxyOsugarEYQ6TxCTr/CWHWU9G28yXSaQ66S3rsxl5aSpUCY+lUwIEVmZ9SyAa+g4FV3EfRitssiKMdCuli46YQ0/uxc59igCdgd4uxygswYgUGfP4HLQ5wEGPn7H4Q5IxSlxPvc60fYxgkRo9NMZgAljRohGdKP2u6jjAgMBAAECggEAGRakbljwHCRlvoi/qyU7qgC7k0j+/7MxSNNDAfPvK6Btp5ru8KwHmWxmS9g3KY6ZafMLtKj8HmuQdhF1DmVN/Z5MmEZ5zK0w+UiqncnRgwK/fhmyJ5Uwdxe8+o+f96dk8jTJmhVcMycl2Eu0Vy5wIE1oJdhgm7cO5dXIpUeTlcx09F3v2xx4lvmJTQvzPxgFYMbB7M8ijEQvkeXdBw7fAlA+izl8Paovgv6tu/dikImZZZgoHKZugZbz3orxpZWiIXzoB9SymBo+lWkeGMj55hlKV9sXTrf5pM6vd5JYmzfYoF/bcO7k4NJ0Elddz3EHe/0IX8M90rAH9WFSdLGseQKBgQDMkEPUfrWP/Z6nE76muUQE4y3OH0ckLacbCEI+RseVNqSKIs+TrzhQllvb/V/foeiv6SLBvmyWbO3AX+Gh9GuedLyRTct/K9o1J3Q4GAa8jGJeoi1uYPPAfqt3BMv05/i1jIvTePUrxp1NV7u0/i9QmV4R1it0+abs2Ro8Q3XqZwKBgQChZa3UBe4FbaTBWVToU4lW5KdEv93gm6iKQiHWI4yTXaJJlPOo8Hx9+/REeaxOIsaW6XZLyarNuh+cThTv4GLJKjogjcq9B1oNWgS6Z41CJZIkW/IFgjZvHh3n+SD3pTijA9y7usgu/R0OsVwrlAMyMvl7JdIMRYXFckRhb1v4JQKBgQC3+Ao4gZfRnjpfcd9k23rzlkfsdq6pN7FwGzZQAaGebNz/Kh1aaRuRRhfouW7OlTLJeTZ73UCU6/PJrbEi0Mk0YTHwz3DytsJwSUI47EqqqOoSx3FqMiEk/gZAbHzsjO5cf8CEd+St8Noo43z5Yhu1NainC+BbO+ZGXV0900GpgwKBgEEx2nK/5nLo5Fl55VNnkx23hV2/BzhYiE85AYQHnhxVAV4pvfcrFY6qfPRAFfsGDyQcsD1S/BzYJzazT7/J6v2JgituO0v6MUUdbLWDaMskdBEd1vikrapbBweSWd/PLL6kq8BlZcGdWuR5flrYEiZv8tjs4Rk16CBm1PpqykLFAoGASgkWQocPk0PYnEr1anXeiabc+/hMj4cZv3ynGv7NU9hUkZszMDKutG63y3nZ1QJPtfcF7xgTKpABfdIMCbAzKzDpd2znFg/bTxCV23GV6SNSWU+R8WC+30jw5o3W++wcILmd83L4IWLXUo6+GI0wqDBNOYG+nDLs1gWfBvX4UbI=
-#微信支付appid、mchid、密钥、小程序appid、小程序密钥
+  RETURN_URL_WAP: http://111.203.232.171:8999/#/history
+  RETURN_URL_PC: http://111.203.232.171:8999/#/wallet
+  NOTIFY_URL: http://111.203.232.171:8997/pay/aliPayCallBack.do
+#微信支付appid、mchid、密钥、小程序appid、小程序密钥、回调地址
 wxPay:
   APP_ID: wx7d8f4502a2bfa865
   MCH_ID: 1606042985
   PRIVATE_KEY: a72e174a8c7f903bc4e5ae3c021eb552
   Applets_ID: wx9390a17892607f6c
   SECRT_KEY: 9af0c20d6d88063aecd0adaea2f9af6d
+  NOTIFY_URL: http://111.203.232.171:8997/pay/wxPayCallBack.do
 

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

@@ -74,16 +74,20 @@ jwt:
   expire: 14400
 logging:
   config: classpath:logback-spring.xml
-#支付宝支付appid、支付宝公钥、应用私钥
+#支付宝支付appid、支付宝公钥、应用私钥、手机网页支付成功跳转地址、pc端支付成功跳转地址、回调地址
 aliPay:
   APP_ID: 2021002126609937
   ALIPAY_PUBLIC_KEY: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2cUDFyw7sLpTpICDURNefRfzr7I7qO5Spq6HwdyFbVv5m6wVzt3fXYTcDrVUuzfbV7+rrXqnvk7LNOp10qPtUyHyZKO2jTBBcUK5H0RPNzs1XInKaSTAznGH8dEAk6yQiwhSDpQzwoOq1Ool2MQocdkcBWwAMEcEUByIbJ4ABsrwXdmkgu2hDHR/GgLvarUp1zOXfZkaTK//L1GUI5uCI+/omcqMPDIOwd8DfcNr0TKlXfAEixp9eVuU/b09b7vW7O9Vh+w0gmy5FN+BWX/JaRRL1DhRqbHl7Sl4/oGu1yjfQA5U8jXBgd+QjwdUiAXVwPdESS/AUbPWE517eH5FtQIDAQAB
   PRIVATE_KEY: MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCA9/p6UJH2kpTumbyRt/gdAOUnRJQ0VRQj/o0GtJ9ECweSIk6+8K81CAGcfmdeB6ZfteXZlKr9SGf3hkwuOz5oOJb5GAmKgv60T6zrBm5/MSVYhDY935eCYjFSj59w2120kvtWvq94Km3TkvAstrbSwBgpS4eutZ2qg1U4h5j6H3v+PB6RxyOsugarEYQ6TxCTr/CWHWU9G28yXSaQ66S3rsxl5aSpUCY+lUwIEVmZ9SyAa+g4FV3EfRitssiKMdCuli46YQ0/uxc59igCdgd4uxygswYgUGfP4HLQ5wEGPn7H4Q5IxSlxPvc60fYxgkRo9NMZgAljRohGdKP2u6jjAgMBAAECggEAGRakbljwHCRlvoi/qyU7qgC7k0j+/7MxSNNDAfPvK6Btp5ru8KwHmWxmS9g3KY6ZafMLtKj8HmuQdhF1DmVN/Z5MmEZ5zK0w+UiqncnRgwK/fhmyJ5Uwdxe8+o+f96dk8jTJmhVcMycl2Eu0Vy5wIE1oJdhgm7cO5dXIpUeTlcx09F3v2xx4lvmJTQvzPxgFYMbB7M8ijEQvkeXdBw7fAlA+izl8Paovgv6tu/dikImZZZgoHKZugZbz3orxpZWiIXzoB9SymBo+lWkeGMj55hlKV9sXTrf5pM6vd5JYmzfYoF/bcO7k4NJ0Elddz3EHe/0IX8M90rAH9WFSdLGseQKBgQDMkEPUfrWP/Z6nE76muUQE4y3OH0ckLacbCEI+RseVNqSKIs+TrzhQllvb/V/foeiv6SLBvmyWbO3AX+Gh9GuedLyRTct/K9o1J3Q4GAa8jGJeoi1uYPPAfqt3BMv05/i1jIvTePUrxp1NV7u0/i9QmV4R1it0+abs2Ro8Q3XqZwKBgQChZa3UBe4FbaTBWVToU4lW5KdEv93gm6iKQiHWI4yTXaJJlPOo8Hx9+/REeaxOIsaW6XZLyarNuh+cThTv4GLJKjogjcq9B1oNWgS6Z41CJZIkW/IFgjZvHh3n+SD3pTijA9y7usgu/R0OsVwrlAMyMvl7JdIMRYXFckRhb1v4JQKBgQC3+Ao4gZfRnjpfcd9k23rzlkfsdq6pN7FwGzZQAaGebNz/Kh1aaRuRRhfouW7OlTLJeTZ73UCU6/PJrbEi0Mk0YTHwz3DytsJwSUI47EqqqOoSx3FqMiEk/gZAbHzsjO5cf8CEd+St8Noo43z5Yhu1NainC+BbO+ZGXV0900GpgwKBgEEx2nK/5nLo5Fl55VNnkx23hV2/BzhYiE85AYQHnhxVAV4pvfcrFY6qfPRAFfsGDyQcsD1S/BzYJzazT7/J6v2JgituO0v6MUUdbLWDaMskdBEd1vikrapbBweSWd/PLL6kq8BlZcGdWuR5flrYEiZv8tjs4Rk16CBm1PpqykLFAoGASgkWQocPk0PYnEr1anXeiabc+/hMj4cZv3ynGv7NU9hUkZszMDKutG63y3nZ1QJPtfcF7xgTKpABfdIMCbAzKzDpd2znFg/bTxCV23GV6SNSWU+R8WC+30jw5o3W++wcILmd83L4IWLXUo6+GI0wqDBNOYG+nDLs1gWfBvX4UbI=
-#微信支付appid、mchid、密钥、小程序appid、小程序密钥
+  RETURN_URL_WAP: https://jygkzy.com/#/history
+  RETURN_URL_PC: https://jygkzy.com/#/wallet
+  NOTIFY_URL: https://jygkzy.com/api/pay/aliPayCallBack.do
+#微信支付appid、mchid、密钥、小程序appid、小程序密钥、回调地址
 wxPay:
   APP_ID: wx7d8f4502a2bfa865
   MCH_ID: 1606042985
   PRIVATE_KEY: a72e174a8c7f903bc4e5ae3c021eb552
   Applets_ID: wx9390a17892607f6c
   SECRT_KEY: 9af0c20d6d88063aecd0adaea2f9af6d
+  NOTIFY_URL: https://jygkzy.com/api/pay/wxPayCallBack.do
 

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

@@ -13,7 +13,7 @@ spring:
     allow-bean-definition-overriding: true
   # 环境 dev|test|prod
   profiles:
-    active: prod
+    active: dev
   # jackson时间格式化
   jackson:
     time-zone: GMT+8