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

添加耗材警告

This commit is contained in:
韩鹏辉 2024-07-05 14:22:21 +08:00
parent d772c63ee5
commit 4d526525a5
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/chaozhanggui/system/cashierservice/dao/TbUserShopMsgMapper.java
View File

@ -27,5 +27,5 @@ public interface TbUserShopMsgMapper {
TbUserShopMsg selectByShopId(@Param("shopId") String shopId);
List<TbUserShopMsg> selectByShopId(@Param("shopId") Integer shopId);
List<TbUserShopMsg> selectAllByShopId(@Param("shopId") Integer shopId);
}

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

@ -116,7 +116,7 @@ public class ConsMsgConsumer {
String key = redisUtil.getMessage(RedisCst.ORDER_MESSAGE.concat(tbConsInfo.getShopId().toString()).concat("#").concat(tbConsInfo.getId().toString()));
if (Objects.isNull(key)) {
List<TbUserShopMsg> tbUserShopMsgs = tbUserShopMsgMapper.selectByShopId(tbConsInfo.getShopId());
List<TbUserShopMsg> tbUserShopMsgs = tbUserShopMsgMapper.selectAllByShopId(tbConsInfo.getShopId());
if (Objects.nonNull(tbUserShopMsgs) && tbUserShopMsgs.size()>0) {
for (TbUserShopMsg tbUserShopMsg : tbUserShopMsgs) {

11
src/main/java/com/chaozhanggui/system/cashierservice/service/ConsService.java
View File

@ -44,6 +44,9 @@ public class ConsService {
String orderId=jsonObject.getString("orderId");
Thread.sleep(1000L);
List<TbOrderDetail> orderDetails= tbOrderDetailMapper.selectAllByOrderId(Integer.valueOf(orderId));
if(Objects.isNull(orderDetails)||orderDetails.size()<=0){
@ -71,17 +74,17 @@ public class ConsService {
amount=proskuCon.getSurplusStock().multiply(new BigDecimal(orderDetail.getNum()));
flow.setAmount(amount);
flow.setBalance(tbConsInfo.getStockNumber().subtract(amount));
flow.setBalance(tbConsInfo.getStockNumber().subtract(amount).subtract(tbConsInfo.getStockConsume()));
flow.setBizCode("createCart");
flow.setBizName("加入购物车消耗");
flow.setBizName("销售扣除");
flow.setBizType("-");
}else if("delete".equals(type)){
amount=proskuCon.getSurplusStock().multiply(new BigDecimal(orderDetail.getNum())).negate();
flow.setAmount(amount.abs());
flow.setBalance(tbConsInfo.getStockNumber().subtract(amount));
flow.setBalance(tbConsInfo.getStockNumber().subtract(amount).subtract(tbConsInfo.getStockConsume()));
flow.setBizCode("cancelCart");
flow.setBizName("取消购物车返回");
flow.setBizName("退单返还");
flow.setBizType("+");
}

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

@ -540,9 +540,6 @@ public class OrderService {
jsonObject.put("type","create");
producer.cons(jsonObject.toString());
return Result.success(CodeEnum.SUCCESS, orderInfo);
}

4
src/main/resources/mapper/TbUserShopMsgMapper.xml
View File

@ -115,7 +115,7 @@
where id = #{id,jdbcType=INTEGER}
</update>
<select id="selectByShopId" resultMap="BaseResultMap">
<select id="selectAllByShopId" resultMap="BaseResultMap">
select * from tb_user_shop_msg where shop_id=#{shopId}
</select>
</select>
</mapper>