zoujiajian před 1 rokem
rodič
revize
4806dd5916

+ 2 - 1
netflix-dao/src/main/java/com/cyksj/model/entity/UserBalanceSourceRecord.java

@@ -35,7 +35,8 @@ public class UserBalanceSourceRecord extends BaseEntity{
 		price_differ("订单补差价"),
 		compensate("系统补偿"),
 		manual("手动扣除"),
-		wholesale_differ("返批发差价")
+		wholesale_differ("返批发差价"),
+		wholesale_order("批发订单"),
 		;
 		String desc;
 

+ 10 - 0
netflix-service/src/main/java/com/cyksj/service/order/impl/GoodsWholesalePayServiceImpl.java

@@ -89,6 +89,8 @@ public class GoodsWholesalePayServiceImpl implements GoodsWholesalePayService {
 
 	private final WeChatService weChatService;
 
+	private final GoodsDonMapper goodsDonMapper;
+
 	@Override
 	public GoodsWholesaleOrderDon unifiedPay(GoodsWholesaleOrderPayReq payReq) throws Exception {
 		Long userId = payReq.getUserId();
@@ -212,6 +214,7 @@ public class GoodsWholesalePayServiceImpl implements GoodsWholesalePayService {
 		GoodsWholesale goodsWholesale = goodsWholesaleMapper.selectOne(Wrappers.lambdaQuery(GoodsWholesale.class)
 				.eq(GoodsWholesale::getSkuId, skuId)
 				.eq(GoodsWholesale::getDeleted, 1)
+				.eq(GoodsWholesale::getStatus, 1)
 				.last("limit 1"));
 		if (goodsWholesale != null && goodsWholesale.getIsReturn()) {
 			//目前购买多少个
@@ -459,6 +462,13 @@ public class GoodsWholesalePayServiceImpl implements GoodsWholesalePayService {
 		returnDeposit(orderDon, userIdList);
 		//返批发余额差价
 		returnWholesaleBalanceDiffer(orderDon, userIdList);
+
+		//余额使用记录
+		if (orderDon.getBalance().compareTo(BigDecimal.ZERO) > 0) {
+			Long goodsId = orderDon.getGoodsId();
+			GoodsDon goodsDon = goodsDonMapper.selectById(goodsId);
+			userBenefitsService.recordBalanceBySource(orderDon.getUserId(), orderDon.getBalance().negate(), UserBalanceSourceRecord.Source.wholesale_order, orderDon.getId(), goodsDon.getTitle() + UserBalanceSourceRecord.Source.wholesale_order.getDesc());
+		}
 	}
 
 	/**