czg_team
/
cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
张松 2025-03-04 16:52:00 +08:00
parent 7829ac2b0a cc53abccc4
commit 615f32d32d
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
View File

@ -694,7 +694,11 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
//折扣信息 //折扣信息
orderInfo.setDiscountInfo(buildDiscountInfo(orderInfo)); orderInfo.setDiscountInfo(buildDiscountInfo(orderInfo));
//最终折扣 //最终折扣
orderInfo.setDiscountRatio(orderInfo.getOriginAmount().divide(param.getOrderAmount(), 2, RoundingMode.UP)); if (param.getOrderAmount().compareTo(BigDecimal.ZERO) != 0) {
orderInfo.setDiscountRatio(orderInfo.getOriginAmount().divide(param.getOrderAmount(), 2, RoundingMode.UP));
} else {
orderInfo.setDiscountRatio(BigDecimal.ZERO);
}
saveOrUpdate(orderInfo); saveOrUpdate(orderInfo);
} }

7
cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ProductRpcServiceImpl.java
View File

@ -3,6 +3,7 @@ package com.czg.service.product.service.impl;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.convert.Convert; import cn.hutool.core.convert.Convert;
import cn.hutool.core.thread.ThreadUtil;
import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.NumberUtil;
import com.czg.config.RabbitPublisher; import com.czg.config.RabbitPublisher;
import com.czg.constant.CacheConstant; import com.czg.constant.CacheConstant;
@ -108,11 +109,9 @@ public class ProductRpcServiceImpl implements ProductRpcService {
consStockFlowMapper.insert(consStockFlow); consStockFlowMapper.insert(consStockFlow);
} }
} }
/*try { ThreadUtil.execAsync(() -> {
rabbitPublisher.sendProductInfoChangeMsg(Convert.toStr(shopId)); rabbitPublisher.sendProductInfoChangeMsg(Convert.toStr(shopId));
} catch (Exception e) { });
log.error("发送商品信息变更Mq消息失败：", e);
}*/
log.info("ProductService.--------------------------------------------库存更新成功"); log.info("ProductService.--------------------------------------------库存更新成功");
} }