czg_team/cashier-client
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

添加会员充值密码

Browse Source
This commit is contained in:
牛叉闪闪
2024-07-13 15:09:38 +08:00
parent 944b1102e5
commit 0a0d009b2c
2 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/chaozhanggui/system/cashierservice/controller/PayController.java
View File

@@ -215,10 +215,11 @@ public class PayController {
public Result returnOrder(@RequestHeader("token") String token, public Result returnOrder(@RequestHeader("token") String token,
@RequestHeader("loginName") String loginName, @RequestHeader("loginName") String loginName,
@RequestHeader("clientType") String clientType, @RequestHeader("clientType") String clientType,
@RequestBody List<TbOrderDetail> list, @RequestBody List<TbOrderDetail> list
@RequestParam("pwd") String pwd
){ ){
return payService.returnOrder(list,token,pwd);
return payService.returnOrder(list,token,null);
} }

33
src/main/java/com/chaozhanggui/system/cashierservice/service/MemberService.java
View File

@@ -523,27 +523,26 @@ public class MemberService {
|| !map.containsKey("shopId") || ObjectUtil.isEmpty(map.get("shopId")) || !map.containsKey("shopId") || ObjectUtil.isEmpty(map.get("shopId"))
|| !map.containsKey("memberId") || ObjectUtil.isEmpty(map.get("memberId")) || !map.containsKey("memberId") || ObjectUtil.isEmpty(map.get("memberId"))
|| !map.containsKey("amount") || ObjectUtil.isEmpty(map.get("amount")) || !map.containsKey("amount") || ObjectUtil.isEmpty(map.get("amount"))
// ||!map.containsKey("pwd")||ObjectUtil.isEmpty(map.get("pwd")) ||!map.containsKey("pwd")||ObjectUtil.isEmpty(map.get("pwd"))
) { ) {
return Result.fail(CodeEnum.PARAM); return Result.fail(CodeEnum.PARAM);
} }
// String accountId= TokenUtil.parseParamFromToken(token).getString("accountId");
// String accountId= TokenUtil.parseParamFromToken(token).getString("accountId");
// TbmerchantAccount account= tbmerchantAccountMapper.selectByPrimaryKey(Integer.valueOf(accountId));
// TbmerchantAccount account= tbmerchantAccountMapper.selectByPrimaryKey(Integer.valueOf(accountId)); if(Objects.isNull(account)){
// if(Objects.isNull(account)){ return Result.fail(CodeEnum.ACCOUNTEIXST);
// return Result.fail(CodeEnum.ACCOUNTEIXST); }
// }
//
// if(Objects.isNull(account.getPwd())||ObjectUtil.isEmpty(account.getPwd())){
// if(Objects.isNull(account.getPwd())||ObjectUtil.isEmpty(account.getPwd())){ return Result.fail(CodeEnum.PWDNOSET);
// return Result.fail(CodeEnum.PWDNOSET); }
// }
// if(!account.getPwd().equals(MD5Util.encrypt(map.get("pwd").toString().concat(account.getAccount()).concat(account.getId().toString())))){
// if(!account.getPwd().equals(MD5Util.encrypt(map.get("pwd").toString().concat(account.getAccount()).concat(account.getId().toString())))){ return Result.fail(CodeEnum.PWDERROE);
// return Result.fail(CodeEnum.PWDERROE); }
// }
String memberId = String.valueOf(map.get("memberId")); String memberId = String.valueOf(map.get("memberId"));