ソースを参照

fix 计费单商品

he2802 4 年 前
コミット
926329af50

+ 1 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderBillSheetServiceImpl.java

@@ -149,7 +149,7 @@ public class OrderBillSheetServiceImpl extends ServiceImpl<OrderBillSheetMapper,
             //订单商品
             OrderGoods goods = iOrderGoodsService.getOne(new LambdaQueryWrapper<OrderGoods>().eq(OrderGoods::getOrderSn, bo.getOrderSn()).eq(OrderGoods::getGoodsId,g.getGoodsId()));
             //计费单已收费用累加
-            goods.getGoodsReceived().add(orderGoods.getAmount());
+            goods.setGoodsReceived(goods.getGoodsReceived().add(orderGoods.getAmount()));
             if(goods.getGoodsRealPrice().compareTo(goods.getGoodsReceived()) == -1){
                 throw new CustomException("已收费用超出成交价");
             }

+ 3 - 3
zhongzheng-system/src/main/java/com/zhongzheng/modules/order/vo/OrderGoodsVo.java

@@ -57,9 +57,9 @@ public class OrderGoodsVo {
 
 	private String goodsName;
 
-	/**  状态 1正常 0关闭 -1有退款 */
-	@Excel(name = " 状态 1正常 0关闭 -1有退款")
-	@ApiModelProperty(" 状态 1正常 0关闭 -1有退款")
+	/**  状态 1正常 0关闭  */
+	@Excel(name = " 状态 1正常 0关闭")
+	@ApiModelProperty(" 状态 1正常 0关闭")
 	private Integer status;
 
 	/** 已收金额 */

+ 1 - 0
zhongzheng-system/src/main/resources/mapper/modules/order/OrderGoodsMapper.xml

@@ -58,5 +58,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 AND og.order_sn =  #{orderSn}
             </if>
 
+
     </select>
 </mapper>