计算账单

ch-admin-api/src/main/java/com/wwdz/ch/admin/impl/SysUserBillServiceImpl.java

@@ -17,6 +17,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -40,7 +41,6 @@ public class SysUserBillServiceImpl implements SysUserBillService {
 
 
 
-    @Transactional
     @Override
     public Result finishCalculate(DistributionOrder distributionOrder) throws Exception{
         SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM");

ch-wx-api/src/main/java/com/wwdz/ch/wx/api/WxPayCallbackController.java

@@ -305,12 +305,12 @@ public class WxPayCallbackController {
             //更新库存
             supplierItemService.reduceStock(distributionOrder.getItemId(), distributionOrder.getItemNum());
             logger.info(">>>>>>>>>>>> 竞拍订单，微信支付回调通知处理成功，更新拍卖订单状态和商品库存 <<<<<<<<<<<<");
+            //更新拍品配置中的状态为"成交"
+            auctionConfigDao.updateState(distributionOrder.getItemId(), AuctionEnum.StateEnum.DEALED.getCode());
+
             //新增用户账户的明细,调整月度账单
             DistributorProfit distributorProfit = distributorProfitDao.findById(distributionOrderId);
             userAccountDetailService.create(distributionOrder, distributorProfit);
-
-            //更新拍品配置中的状态为"成交"
-            auctionConfigDao.updateState(distributionOrder.getItemId(), AuctionEnum.StateEnum.DEALED.getCode());
             return Result.success();
         } catch (Exception e) {
             logger.error(">>>>>>>>>>>> 竞拍订单，微信支付回调通知处理失败 error :{}", e);

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/distribution/UserBillServiceImpl.java

@@ -39,7 +39,6 @@ public class UserBillServiceImpl implements UserBillService {
     @Autowired
     DistributorProfitDao distributorProfitDao;
 
-    @Transactional
     @Override
     public Result payCalculate(DistributionOrder distributionOrder, DistributorProfit distributorProfit) throws Exception {
         SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM");