diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbConsInfoFlow.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbConsInfoFlow.java index 0e22495..784a13a 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbConsInfoFlow.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbConsInfoFlow.java @@ -25,6 +25,12 @@ public class TbConsInfoFlow implements Serializable { private String bizType; + + + private Integer orderId; + + private String orderNo; + private Date createTime; private Date updateTime; @@ -126,4 +132,20 @@ public class TbConsInfoFlow implements Serializable { public void setUpdateTime(Date updateTime) { this.updateTime = updateTime; } + + public Integer getOrderId() { + return orderId; + } + + public void setOrderId(Integer orderId) { + this.orderId = orderId; + } + + public String getOrderNo() { + return orderNo; + } + + public void setOrderNo(String orderNo) { + this.orderNo = orderNo; + } } \ No newline at end of file diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/ConsService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/ConsService.java index 75bb673..99c2e34 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/ConsService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/ConsService.java @@ -35,6 +35,9 @@ public class ConsService { @Autowired TbOrderDetailMapper tbOrderDetailMapper; + @Autowired + TbOrderInfoMapper tbOrderInfoMapper; + @Transactional(rollbackFor = Exception.class) public void exect(String message) throws Exception { log.info("耗材信息更新开始:{}",message); @@ -47,7 +50,11 @@ public class ConsService { Thread.sleep(1000L); - + TbOrderInfo tbOrderInfo=tbOrderInfoMapper.selectByPrimaryKey(Integer.valueOf(orderId)); + if(Objects.isNull(tbOrderInfo)){ + log.info("订单信息不存在"); + return; + } List orderDetails= tbOrderDetailMapper.selectAllByOrderId(Integer.valueOf(orderId)); if(Objects.isNull(orderDetails)||orderDetails.size()<=0){ @@ -102,10 +109,18 @@ public class ConsService { // ConsInfoPO consInfoPO=new ConsInfoPO(tbConsInfo.getId(),amount); // consInfoPOS.add(consInfoPO); + flow.setOrderId(tbOrderInfo.getId()); + flow.setOrderNo(tbOrderInfo.getOrderNo()); + flow.setCreateTime(new Date()); // flow.setUpdateTime(new Date()); // consInfoFlows.add(flow); + if(amount.equals(BigDecimal.ZERO)){ + log.info("变动金额为 0:{}",amount); + continue; + } + tbConsInfoMapper.updateByPrimaryKey(tbConsInfo); tbConsInfoFlowMapper.insert(flow); diff --git a/src/main/resources/mapper/TbConsInfoFlowMapper.xml b/src/main/resources/mapper/TbConsInfoFlowMapper.xml index 229c085..c7c5ad8 100644 --- a/src/main/resources/mapper/TbConsInfoFlowMapper.xml +++ b/src/main/resources/mapper/TbConsInfoFlowMapper.xml @@ -14,10 +14,12 @@ + + id, shop_id, cons_id, con_name, amount, balance, biz_code, biz_name, biz_type, create_time, - update_time + update_time,order_id,order_no