|
|
@@ -59,8 +59,8 @@ public class MintOrderService {
|
|
|
private Environment env;
|
|
|
private AdapayProperties adapayProperties;
|
|
|
private SnowflakeIdWorker snowflakeIdWorker;
|
|
|
- private WxPayProperties wxPayProperties;
|
|
|
- private WxPayService wxPayService;
|
|
|
+ private WxPayProperties wxPayProperties;
|
|
|
+ private WxPayService wxPayService;
|
|
|
|
|
|
public Page<MintOrder> all(PageQuery pageQuery) {
|
|
|
return mintOrderRepo.findAll(JpaUtils.toSpecification(pageQuery, MintOrder.class), JpaUtils.toPageRequest(pageQuery));
|
|
|
@@ -219,6 +219,9 @@ public class MintOrderService {
|
|
|
.orElse(null))
|
|
|
.build());
|
|
|
|
|
|
+ //库存
|
|
|
+ mintActivity.setStock(mintActivity.getStock() - 1);
|
|
|
+ mintActivityRepo.save(mintActivity);
|
|
|
}
|
|
|
|
|
|
public Object payOrderWeixin(Long id, String tradeType, String openId) throws WxPayException, EncoderException {
|
|
|
@@ -394,5 +397,8 @@ public class MintOrderService {
|
|
|
order.setStatus(MintOrderStatus.CANCELLED);
|
|
|
order.setCancelTime(LocalDateTime.now());
|
|
|
mintOrderRepo.save(order);
|
|
|
+
|
|
|
+ // 加库存
|
|
|
+ mintActivityRepo.addStock(order.getMintActivityId());
|
|
|
}
|
|
|
}
|