123

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/MyWalletBiz.java

@@ -140,7 +140,7 @@ public class MyWalletBiz extends BaseBiz<MyWalletMapper, MyWallet> {
         return ObjectRestResponse.succ(flag);
     }
 
-    //设置密码type 1-设置密码；2-设置密码
+    //设置密码type 1-设置密码；2-修改密码
     public ObjectRestResponse setPwd(Integer userId,String phone,String mobilecod,String password,Integer type){
         if (StringUtils.isBlank(phone)||StringUtils.isBlank(mobilecod)||StringUtils.isBlank(password)){
             return ObjectRestResponse.createFailedResult(ResultCode.NULL_CODE, "参数为空");
@@ -156,7 +156,7 @@ public class MyWalletBiz extends BaseBiz<MyWalletMapper, MyWallet> {
         if (myWallet==null){
             return ObjectRestResponse.createFailedResult(ResultCode.NULL_CODE, "钱包不存在");
         }
-        if(type==1||StringUtils.isNotBlank(myWallet.getPayPassword())){
+        if(type==1&&StringUtils.isNotBlank(myWallet.getPayPassword())){
             return ObjectRestResponse.createFailedResult(ResultCode.EXIST_CODE, "密码已存在");
         }
         password=new BCryptPasswordEncoder(UserConstant.PW_ENCORDER_SALT).encode(password);

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/MyWalletController.java

@@ -51,7 +51,7 @@ public class MyWalletController {
 
      }
 
-    @GetMapping
+    @GetMapping("/checkCode")
     @ApiOperation("检查验证码")
     public ObjectRestResponse  checkCode(
             @RequestParam(value = "phone",defaultValue = "")String phone,

xx-app/xx-app-api/src/main/java/com/xxfc/platform/app/feign/ConfigFeign.java

@@ -17,6 +17,6 @@ public interface ConfigFeign {
     @RequestMapping(value = "/cofig/app/unauth/types",method = RequestMethod.GET)
     ObjectRestResponse<Cofig> getAllByType(String types);
 
-     @GetMapping("/app/unauth/withdraw_rule")
+     @GetMapping("/cofig/app/unauth/withdraw_rule")
      WithDrawRuleVo getWithDrawRule();
 }

xx-app/xx-app-server/src/main/java/com/xxfc/platform/app/biz/CofigBiz.java

@@ -39,13 +39,12 @@ public class CofigBiz extends BaseBiz<CofigMapper,Cofig> {
      * @param cofig
      * @return
      */
-    @CacheClear(pre = "app:withdrawrule:",key = "config{1}")
+    @CacheClear(pre = "app:withdrawrule:",key = "{1.type}")
     public int updateConfig(Cofig cofig) {
         EntityUtils.setUpdatedInfo(cofig);
        return mapper.updateByPrimaryKeySelective(cofig);
     }
 
-    @Cache(key = "app:withdrawrule:88")
     public WithDrawRuleVo getWithDrawRule(){
         WithDrawRuleVo withDrawRuleVo = new WithDrawRuleVo();
         Example example  = new Example(Cofig.class);