嘉视达
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
“mitao”
2025-12-20 8832646742aff7d8ad37471f41350cd8950caf67 
 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ICBCNotifyServiceImpl.java


@@ -11,15 +11,13 @@


import com.ruoyi.system.config.ICBCConfig;


import com.ruoyi.system.model.TBigGiftPackageOrder;


import com.ruoyi.system.model.TPhysicalGoodsOrder;


import com.ruoyi.system.service.ICBCNotifyService;


import com.ruoyi.system.service.TBigGiftPackageOrderService;


import com.ruoyi.system.service.TCommissionTransactionFlowService;


import com.ruoyi.system.service.TPhysicalGoodsOrderService;


import com.ruoyi.system.service.*;


import lombok.RequiredArgsConstructor;


import lombok.extern.slf4j.Slf4j;


import org.springframework.context.annotation.Lazy;


import org.springframework.stereotype.Service;


import org.springframework.transaction.annotation.Transactional;




import javax.annotation.Resource;


import javax.servlet.http.HttpServletRequest;


import javax.servlet.http.HttpServletResponse;


import java.io.IOException;


@@ -36,19 +34,16 @@


 */


@Service


@Slf4j


@RequiredArgsConstructor(onConstructor_ = @Lazy)


public class ICBCNotifyServiceImpl implements ICBCNotifyService {




    @Resource


    private ICBCConfig icbcConfig;


    private final ICBCConfig icbcConfig;




    @Resource


    private TBigGiftPackageOrderService bigGiftPackageOrderService;


    private final TBigGiftPackageOrderService bigGiftPackageOrderService;




    @Resource


    private TPhysicalGoodsOrderService physicalGoodsOrderService;


    private final TPhysicalGoodsOrderService physicalGoodsOrderService;




    @Resource


    private TCommissionTransactionFlowService commissionTransactionFlowService;


    private final TCommissionTransactionFlowService commissionTransactionFlowService;




    @Override


    @Transactional(rollbackFor = Exception.class)


@@ -217,14 +212,6 @@


                    physicalGoodsOrderService.updateById(order);


                    log.info("订单{}状态更新为完成支付", orderCode);




                    // 实物商品支付完成后，立即计算分佣


                    commissionTransactionFlowService.calculateAndSaveCommission(


                            order.getId(),


                            2, // 订单类型：2=实物商品


                            order.getOrderPrice(),


                            order.getAppUserId()


                    );


                    log.info("订单{}分佣计算完成", orderCode);


                } else {


                    log.error("订单{}【工商银行】实物商品支付失败，错误信息：{}", orderCode, bizContent.getString("return_msg"));


                }