退款暂不校验密码

This commit is contained in:
GYJ
2024-07-12 10:23:01 +08:00
parent 81158431c8
commit 2a28151139

View File

@@ -726,24 +726,22 @@ public class PayService {
if (ObjectUtil.isEmpty(list) || list.size() <= 0) { if (ObjectUtil.isEmpty(list) || list.size() <= 0) {
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));
// if(Objects.isNull(account)){
TbmerchantAccount account= tbmerchantAccountMapper.selectByPrimaryKey(Integer.valueOf(accountId)); // return Result.fail(CodeEnum.ACCOUNTEIXST);
if(Objects.isNull(account)){ // }
return Result.fail(CodeEnum.ACCOUNTEIXST); //
} //
// if(Objects.isNull(account.getPwd())||ObjectUtil.isEmpty(account.getPwd())){
// return Result.fail(CodeEnum.PWDNOSET);
if(Objects.isNull(account.getPwd())||ObjectUtil.isEmpty(account.getPwd())){ // }
return Result.fail(CodeEnum.PWDNOSET); //
} // if(!account.getPwd().equals(MD5Util.encrypt(pwd.concat(account.getAccount()).concat(account.getId().toString())))){
// return Result.fail(CodeEnum.PWDERROE);
if(!account.getPwd().equals(MD5Util.encrypt(pwd.concat(account.getAccount()).concat(account.getId().toString())))){ // }
return Result.fail(CodeEnum.PWDERROE);
}
Integer orderId = list.get(0).getOrderId(); Integer orderId = list.get(0).getOrderId();
@@ -755,11 +753,6 @@ public class PayService {
return Result.fail(CodeEnum.ORDERSTATUSERROR); return Result.fail(CodeEnum.ORDERSTATUSERROR);
} }
List<TbOrderDetail> orderDetails = tbOrderDetailMapper.selectAllByOrderIdAndStatus(list, orderId.toString()); List<TbOrderDetail> orderDetails = tbOrderDetailMapper.selectAllByOrderIdAndStatus(list, orderId.toString());