修改状态
This commit is contained in:
@@ -50,7 +50,8 @@ public class LoginFilter implements Filter {
|
|||||||
"cashierService/product/queryProduct",
|
"cashierService/product/queryProduct",
|
||||||
"cashierService/product/productInfo",
|
"cashierService/product/productInfo",
|
||||||
"cashierService/notify/**",//登录部分接口不校验
|
"cashierService/notify/**",//登录部分接口不校验
|
||||||
"notify/**"//回调部分接口不校验
|
"notify/**",
|
||||||
|
"cashierService/table/**"//回调部分接口不校验
|
||||||
);
|
);
|
||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
|
|||||||
@@ -204,6 +204,7 @@ public class LoginContoller {
|
|||||||
|
|
||||||
//生成token
|
//生成token
|
||||||
String token = StringUtil.genRandomNum(6) + StringUtil.getBillno() + StringUtil.genRandomNum(6);
|
String token = StringUtil.genRandomNum(6) + StringUtil.getBillno() + StringUtil.genRandomNum(6);
|
||||||
|
|
||||||
//存入redis
|
//存入redis
|
||||||
OnlineUserDto jwtUserDto = onlineUserService.save(merchantAccount.getName(), merchantAccount.getAccount(), Integer.valueOf(merchantAccount.getShopId()), token, merchantAccount.getStatus());
|
OnlineUserDto jwtUserDto = onlineUserService.save(merchantAccount.getName(), merchantAccount.getAccount(), Integer.valueOf(merchantAccount.getShopId()), token, merchantAccount.getStatus());
|
||||||
|
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ package com.chaozhanggui.system.cashierservice.service;
|
|||||||
import com.chaozhanggui.system.cashierservice.entity.dto.OnlineUserDto;
|
import com.chaozhanggui.system.cashierservice.entity.dto.OnlineUserDto;
|
||||||
import com.chaozhanggui.system.cashierservice.entity.dto.SecurityProperties;
|
import com.chaozhanggui.system.cashierservice.entity.dto.SecurityProperties;
|
||||||
import com.chaozhanggui.system.cashierservice.exception.MsgException;
|
import com.chaozhanggui.system.cashierservice.exception.MsgException;
|
||||||
|
import com.chaozhanggui.system.cashierservice.util.TokenUtil;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.springframework.beans.factory.annotation.Value;
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|||||||
@@ -264,7 +264,8 @@ public class PayService {
|
|||||||
jsonObject1.put("amount", 0);
|
jsonObject1.put("amount", 0);
|
||||||
AppWebSocketServer.AppSendInfo(jsonObject1,key, false);
|
AppWebSocketServer.AppSendInfo(jsonObject1,key, false);
|
||||||
tbCashierCartMapper.updateStatusByOrderId(orderId.toString(),"final");
|
tbCashierCartMapper.updateStatusByOrderId(orderId.toString(),"final");
|
||||||
return Result.success(CodeEnum.SUCCESS,wxScanPayResp.getPayInfo());
|
ObjectMapper mapper = new ObjectMapper();
|
||||||
|
return Result.success(CodeEnum.SUCCESS,mapper.readTree(wxScanPayResp.getPayInfo()));
|
||||||
}else{
|
}else{
|
||||||
return Result.fail(publicResp.getMsg());
|
return Result.fail(publicResp.getMsg());
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user