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

Merge remote-tracking branch 'origin/master' into hph

This commit is contained in:
牛叉闪闪 2024-07-13 15:10:15 +08:00
parent 67228079c2 0a0d009b2c
commit 2a0cd395d7
4 changed files with 21 additions and 28 deletions
Show Stats 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);
} }

2
src/main/java/com/chaozhanggui/system/cashierservice/rabbit/ConsMsgConsumer.java
View File

@ -167,7 +167,7 @@ public class ConsMsgConsumer {
JSONObject resObj = JSONObject.parseObject(response); JSONObject resObj = JSONObject.parseObject(response);
if (ObjectUtil.isNotEmpty(resObj) && ObjectUtil.isNotNull(resObj) && "0".equals(String.valueOf(resObj.get("errcode")))) { if (ObjectUtil.isNotEmpty(resObj) && ObjectUtil.isNotNull(resObj) && "0".equals(String.valueOf(resObj.get("errcode")))) {
log.info("写入redis:{}",key); log.info("写入redis:{}",key);
redisUtil.saveMessage(key, object1.toString(), 10 * 60 * 1000); redisUtil.saveMessage(key, object1.toString(), 10 * 60);
} }
} }
}); });

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

@ -528,7 +528,6 @@ public class MemberService {
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));

39
src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
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());