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

修改订单打包费

This commit is contained in:
19991905653 2024-04-02 13:49:12 +08:00
parent 8462f1c735
commit a83dee6c6e
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -280,11 +280,11 @@ public class OrderService {
orderDetail.setCreateTime(new Date()); orderDetail.setCreateTime(new Date());
orderDetail.setNum(cashierCart.getNumber()); orderDetail.setNum(cashierCart.getNumber());
orderDetail.setPrice(cashierCart.getSalePrice()); orderDetail.setPrice(cashierCart.getSalePrice());
if (cashierCart.getIsPack().equals("true")) { // if (cashierCart.getIsPack().equals("true")) {
orderDetail.setPriceAmount(cashierCart.getTotalAmount().add(cashierCart.getPackFee())); // orderDetail.setPriceAmount(cashierCart.getTotalAmount().add(cashierCart.getPackFee()));
} else { // } else {
orderDetail.setPriceAmount(cashierCart.getTotalAmount()); orderDetail.setPriceAmount(cashierCart.getTotalAmount());
} // }
orderDetail.setProductId(Integer.valueOf(cashierCart.getProductId())); orderDetail.setProductId(Integer.valueOf(cashierCart.getProductId()));
orderDetail.setProductSkuId(Integer.valueOf(cashierCart.getSkuId())); orderDetail.setProductSkuId(Integer.valueOf(cashierCart.getSkuId()));
orderDetail.setProductSkuName(tbProduct.getSpecSnap()); orderDetail.setProductSkuName(tbProduct.getSpecSnap());
@ -320,7 +320,7 @@ public class OrderService {
orderInfo.setUserId(orderVo.getUserId()); orderInfo.setUserId(orderVo.getUserId());
tbOrderInfoMapper.updateByPrimaryKeySelective(orderInfo); tbOrderInfoMapper.updateByPrimaryKeySelective(orderInfo);
} else { } else {
orderInfo = new TbOrderInfo(orderNo, totalAmount, packAMount, totalAmount, saleAmount, totalAmount.add(packAMount), feeAmount, "", orderInfo = new TbOrderInfo(orderNo, totalAmount, packAMount, totalAmount, saleAmount, totalAmount, feeAmount, "",
"table", "cash", orderVo.getMerchantId().toString(), orderVo.getShopId().toString(), "table", "cash", orderVo.getMerchantId().toString(), orderVo.getShopId().toString(),
"", (byte) 1, day, masterId); "", (byte) 1, day, masterId);
orderInfo.setMasterId(masterId); orderInfo.setMasterId(masterId);