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

我得免单订单状态

This commit is contained in:
wangguocheng 2024-05-20 15:21:57 +08:00
parent 3f1839aaab
commit 1aea7ba5ba
11 changed files with 49 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/chaozhanggui/system/cashierservice/auth/LoginFilter.java
View File

@ -42,6 +42,7 @@ public class LoginFilter implements Filter {
"cashierService/location/**",//高德 获取行政区域
"cashierService/home/homePageUp",//首页上半
"cashierService/home",//首页
"cashierService/order/testMessage",//首页
"cashierService/common/**",//通用接口
"cashierService/distirict/**",//首页其它接口
"cashierService/login/**",//登录部分接口不校验

20
src/main/java/com/chaozhanggui/system/cashierservice/controller/LoginContoller.java
View File

@ -271,7 +271,25 @@ public class LoginContoller {
}
}
@PostMapping(value = "modityPass")
public Result modityPass(@RequestHeader String token,@RequestBody UserPassDto passVo){
String userId = TokenUtil.parseParamFromToken(token).getString("userId");
String newPass = MD5Utils.MD5Encode(passVo.getNewPass(), "utf-8");
if (ObjectUtil.isNull(passVo.getCode())) {
String oldPass = MD5Utils.MD5Encode(passVo.getOldPass(), "utf-8");
return loginService.upPass(userId,oldPass, newPass);
} else {
boolean tf = loginService.validate(passVo.getCode(), passVo.getPhone());
if (tf) {
TbUserInfo userInfo=new TbUserInfo();
userInfo.setId(Integer.valueOf(userId));
userInfo.setPassword(newPass);
return loginService.upUserInfo(userInfo);
} else {
return Result.fail("验证码输入有误");
}
}
}
/**
* 用户注册
* phone 手机号

4
src/main/java/com/chaozhanggui/system/cashierservice/controller/OrderController.java
View File

@ -94,4 +94,8 @@ public class OrderController {
private Result yhqDouble(@RequestParam Integer conponsId){
return orderService.yhqDouble(conponsId);
}
@GetMapping("/kc")
private Result kc(){
return orderService.kc();
}
}

2
src/main/java/com/chaozhanggui/system/cashierservice/entity/TbWiningUser.java
View File

@ -45,7 +45,7 @@ public class TbWiningUser implements Serializable {
this.orderAmount = orderAmount;
this.isUser = isUser;
this.tradeDay = tradeDay;
this.isRefund = "false";
this.isRefund = "true";
this.refundAmount = BigDecimal.ZERO;
this.refundPayType = "WX";

1
src/main/java/com/chaozhanggui/system/cashierservice/rabbit/CartConsumer.java
View File

@ -33,6 +33,7 @@ public class CartConsumer {
JSONObject jsonObject = JSON.parseObject(message);
String tableId = jsonObject.getString("tableId");
String shopId = jsonObject.getString("shopId");
log.info("推送信息"+jsonObject.toJSONString());
if (jsonObject.getString("type").equals("addcart") ) {
if (!jsonObject.containsKey("num")) {
throw new MsgException("商品数量错误");

10
src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
View File

@ -196,8 +196,7 @@ public class CartService {
}
@Transactional(rollbackFor = Exception.class)
public void createOrder(JSONObject jsonObject) throws IOException {
try {
public void createOrder(JSONObject jsonObject) throws Exception {
String shopId = jsonObject.getString("shopId");
JSONArray array = JSON.parseArray(redisUtil.getMessage(RedisCst.TABLE_CART.concat(jsonObject.getString("tableId").concat("-").concat(shopId))));
List<Integer> ids = new ArrayList<>();
@ -212,13 +211,13 @@ public class CartService {
Integer orderId = 0;
TbMerchantAccount tbMerchantAccount = merchantAccountMapper.selectByShopId(jsonObject.getString("shopId"));
if (tbMerchantAccount == null) {
throw new MsgException("生成订单错误");
MsgException.throwException("生成订单错误");
}
String userId = jsonObject.getString("userId");
TbUserInfo tbUserInfo = userInfoMapper.selectByPrimaryKey(Integer.valueOf(userId));
if (tbUserInfo == null) {
throw new MsgException("生成订单失败");
MsgException.throwException("生成订单失败");
}
for (int i = 0; i < array.size(); i++) {
JSONObject object = array.getJSONObject(i);
@ -408,9 +407,6 @@ public class CartService {
jsonObject12.put("data", new JSONArray());
AppWebSocketServer.AppSendInfo(jsonObject12, jsonObject.getString("tableId").concat("-").concat(shopId), false);
} catch (Exception e) {
e.getMessage();
}
}
private TbOrderInfo getOrder(BigDecimal totalAmount, BigDecimal packAMount,

7
src/main/java/com/chaozhanggui/system/cashierservice/service/IntegralService.java
View File

@ -28,7 +28,7 @@ public class IntegralService {
@Autowired
private TbOrderInfoMapper orderInfoMapper;
@Autowired
private TbCashierCartMapper cashierCartMapper;
private TbUserInfoMapper userInfoMapper;
@Autowired
private TbProductMapper productMapper;
@Autowired
@ -65,6 +65,11 @@ public class IntegralService {
integralFlow.setType("TRADEADD");
integralFlow.setUserId(userCoupons.getUserId());
integralFlowMapper.insert(integralFlow);
TbUserInfo userInfo = userInfoMapper.selectByPrimaryKey(Integer.valueOf(userCoupons.getUserId()));
if (Objects.nonNull(userInfo)){
userInfo.setTotalScore(userInfo.getTotalScore() + integralFlow.getNum().intValue());
userInfoMapper.updateByPrimaryKeySelective(userInfo);
}
}else {
Integer orderId = jsonObject.getInteger("orderId");
TbOrderInfo orderInfo = orderInfoMapper.selectByPrimaryKey(orderId);

10
src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
View File

@ -242,7 +242,7 @@ public class OrderService {
List<TbProductSku> list = productSkuMapper.selectAll();
for (TbProductSku productSku : list) {
// productSku.setStockNumber(200.00);
redisUtil.saveMessage("PRODUCT:" + productSku.getShopId() + ":" + productSku.getId(), productSku.getStockNumber().intValue() + "");
redisUtil.saveMessage("PRODUCT:" + productSku.getShopId() + ":" + productSku.getId(), "10000");
}
}
@ -402,4 +402,12 @@ public class OrderService {
}
return Result.success(CodeEnum.SUCCESS, pageInfo);
}
public Result kc() {
List<TbProductSku> list = productSkuMapper.selectAll();
for (TbProductSku productSku:list){
redisUtil.saveMessage(RedisCst.PRODUCT + productSku.getShopId() + ":" +productSku.getId(),"10000");
}
return Result.success(CodeEnum.SUCCESS);
}
}

2
src/main/java/com/chaozhanggui/system/cashierservice/service/UserService.java
View File

@ -107,7 +107,7 @@ public class UserService {
tbShopUser.setTotalScore(tbShopUser.getTotalScore() - num.intValue());
}
} else if (type.equals("add")) {
tbShopUser.setTotalScore(tbShopUser.getTotalScore() - num.intValue());
tbShopUser.setTotalScore(tbShopUser.getTotalScore() + num.intValue());
}
if (flag) {
TbReleaseFlow releaseFlow = new TbReleaseFlow();

6
src/main/java/com/chaozhanggui/system/cashierservice/socket/AppWebSocketServer.java
View File

@ -90,6 +90,7 @@ public class AppWebSocketServer {
this.tableId = tableId;
this.shopId = shopId;
this.userId = userId;
log.info("链接桌码："+tableId);
try {
TbShopTable shopTable = shopTableMapper.selectQRcode(tableId);
if (Objects.isNull(shopTable)) {
@ -185,7 +186,7 @@ public class AppWebSocketServer {
@OnMessage
public void onMessage(String message, Session session) {
System.out.println(message);
log.info("接收消息:"+message);
//可以群发消息
//消息保存到数据库、redis
if (StringUtils.isNotBlank(message) && !message.equals("undefined")) {
@ -198,7 +199,8 @@ public class AppWebSocketServer {
//追加发送人(防止串改)
jsonObject.put("tableId", this.tableId);
jsonObject.put("shopId", this.shopId);
log.info("tableId:"+this.tableId);
log.info("shopId:"+this.shopId);
//这里采用责任链模式，每一个处理器对应一个前段发过来的请，这里还可以用工厂模式来生成对象
// ChangeHandler changeHandler = new ChangeHandler();
// CreateOrderHandler createOrderHandler = new CreateOrderHandler();

1
src/main/resources/mapper/TbUserInfoMapper.xml
View File

@ -590,5 +590,4 @@
<select id="selectAll" resultType="com.chaozhanggui.system.cashierservice.entity.TbUserInfo">
select * from tb_user_info
</select>
</mapper>