diff --git a/ruoyi-common/ruoyi-common-pay/src/main/java/com/lakala/zf/laop/java/sdk/demo/utils/V3LakalaUserUtils.java b/ruoyi-common/ruoyi-common-pay/src/main/java/com/lakala/zf/laop/java/sdk/demo/utils/V3LakalaUserUtils.java index b9e6835..4dc98ab 100644 --- a/ruoyi-common/ruoyi-common-pay/src/main/java/com/lakala/zf/laop/java/sdk/demo/utils/V3LakalaUserUtils.java +++ b/ruoyi-common/ruoyi-common-pay/src/main/java/com/lakala/zf/laop/java/sdk/demo/utils/V3LakalaUserUtils.java @@ -29,9 +29,7 @@ public class V3LakalaUserUtils extends BaseCommonDemo { cardBin.setOrderNo(CommonUtil.getOrderNo()); cardBin.setOrgCode(KlkConstant.ORG_CODE); cardBin.setCardNo(acctNo); - System.out.println("cardBin:"+cardBin); String cardBinResponse = LKLSDK.httpPost(cardBin); - System.out.println(cardBinResponse); return JSON.parseObject(cardBinResponse); } diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzProdCommVo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzProdCommVo.java index 203951e..359f46f 100644 --- a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzProdCommVo.java +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzProdCommVo.java @@ -8,6 +8,7 @@ import org.dromara.mall.domain.TzProdComm; import java.io.Serial; import java.io.Serializable; +import java.math.BigDecimal; import java.util.Date; @@ -115,5 +116,15 @@ public class TzProdCommVo implements Serializable { @ExcelProperty(value = "浏览量") private Long num; + /** + * 商品指导价 + */ + private BigDecimal guidingPrice; + + /** + * 商品展示价 + */ + private BigDecimal price; + } diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzProdCommServiceImpl.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzProdCommServiceImpl.java index 9912900..9383754 100644 --- a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzProdCommServiceImpl.java +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzProdCommServiceImpl.java @@ -98,6 +98,12 @@ public class TzProdCommServiceImpl implements ITzProdCommService { vo.setUserAvatar(user.getPic()); vo.setUserName(user.getRealName()); } + + TzProd prod = prodMapper.selectById(vo.getProdId()); + if(prod != null) { + vo.setGuidingPrice(prod.getGuidingPrice()); + vo.setPrice(prod.getPrice()); + } } return page; } @@ -175,16 +181,18 @@ public class TzProdCommServiceImpl implements ITzProdCommService { @Override public Boolean insertByBo(TzProdCommBo bo) { //更新订单状态为已完成 - HyOrderItem orderItem = orderItemMapper.selectById(bo.getOrderItemId()); - orderItem.setStatus(5); - orderItemMapper.updateById(orderItem); - //更新总订单状态为已完成 - HyOrder order = orderMapper.selectById(bo.getOrderId()); - List orderItems = orderItemMapper.selectList(Wrappers.lambdaQuery(HyOrderItem.class).eq(HyOrderItem::getOrderId, bo.getOrderId())); - //判断订单是否已全部完成 - if (orderItems.stream().allMatch(item -> item.getStatus() == 5)) { - order.setStatus(5); - orderMapper.updateById(order); + if (bo.getOrderItemId() != null) { + HyOrderItem orderItem = orderItemMapper.selectById(bo.getOrderItemId()); + orderItem.setStatus(5); + orderItemMapper.updateById(orderItem); + //更新总订单状态为已完成 + HyOrder order = orderMapper.selectById(bo.getOrderId()); + List orderItems = orderItemMapper.selectList(Wrappers.lambdaQuery(HyOrderItem.class).eq(HyOrderItem::getOrderId, bo.getOrderId())); + //判断订单是否已全部完成 + if (orderItems.stream().allMatch(item -> item.getStatus() == 5)) { + order.setStatus(5); + orderMapper.updateById(order); + } } // 根据商品ID查询商品信息 TzProd prod = prodMapper.selectById(bo.getProdId());