|
@@ -186,28 +186,6 @@ public class FsUserInformationCollectionServiceImpl extends ServiceImpl<FsUserIn
|
|
|
@Autowired
|
|
@Autowired
|
|
|
private ICompanyUserCacheService companyUserCacheService;
|
|
private ICompanyUserCacheService companyUserCacheService;
|
|
|
|
|
|
|
|
- @Autowired
|
|
|
|
|
- @Qualifier("hzOMSErpOrderServiceImpl")
|
|
|
|
|
- private IErpOrderService hzOMSerpOrderService;
|
|
|
|
|
-
|
|
|
|
|
- @Autowired
|
|
|
|
|
- @Qualifier("dfOrderServiceImpl")
|
|
|
|
|
- private IErpOrderService dfOrderService;
|
|
|
|
|
-
|
|
|
|
|
- @Autowired
|
|
|
|
|
- @Qualifier("wdtErpOrderServiceImpl")
|
|
|
|
|
- private IErpOrderService wdtErpOrderService;
|
|
|
|
|
-
|
|
|
|
|
- @Autowired
|
|
|
|
|
- @Qualifier("JSTErpOrderServiceImpl")
|
|
|
|
|
- private IErpOrderService jSTOrderService;
|
|
|
|
|
- @Autowired
|
|
|
|
|
- @Qualifier("k9OrderScrmServiceImpl")
|
|
|
|
|
- private IErpOrderService k9OrderService;
|
|
|
|
|
-
|
|
|
|
|
- @Autowired
|
|
|
|
|
- private IErpOrderService erpOrderService;
|
|
|
|
|
-
|
|
|
|
|
@Autowired
|
|
@Autowired
|
|
|
private IFsStoreOrderLogsService fsStoreOrderLogsService;
|
|
private IFsStoreOrderLogsService fsStoreOrderLogsService;
|
|
|
|
|
|
|
@@ -1002,40 +980,6 @@ public class FsUserInformationCollectionServiceImpl extends ServiceImpl<FsUserIn
|
|
|
refund(payment, orderType, orderId);
|
|
refund(payment, orderType, orderId);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
- //erpType== null 兼容之前订单没有设值 erpType==2人工在兔灵作废
|
|
|
|
|
- if (fsStoreOrder.getErpType() == null || fsStoreOrder.getErpType() == 1) {
|
|
|
|
|
- try {
|
|
|
|
|
- //管易作废
|
|
|
|
|
- if (StringUtils.isNotEmpty(fsStoreOrder.getExtendOrderId())) {
|
|
|
|
|
- if (!fsStoreOrder.getExtendOrderId().equals("HIS")) {
|
|
|
|
|
- ErpRefundUpdateRequest request = new ErpRefundUpdateRequest();
|
|
|
|
|
- request.setTid(fsStoreOrder.getOrderCode());
|
|
|
|
|
- request.setOid(fsStoreOrder.getOrderCode());
|
|
|
|
|
- request.setRefund_state(1);
|
|
|
|
|
- //request.setStoreAfterSalesId(fsStoreAfterSales.getId());
|
|
|
|
|
- FsSysConfig sysConfig = configUtil.getSysConfig();
|
|
|
|
|
- Integer erpType = sysConfig.getErpType();
|
|
|
|
|
- if (erpType == 1) {
|
|
|
|
|
- erpOrderService.refundUpdate(request);
|
|
|
|
|
- }else if (erpType == 2) {
|
|
|
|
|
- //旺店通
|
|
|
|
|
- wdtErpOrderService.refundUpdate(request);
|
|
|
|
|
- } else if (erpType == 3) {
|
|
|
|
|
- //瀚智
|
|
|
|
|
- hzOMSerpOrderService.refundUpdate(request);
|
|
|
|
|
- } else if (erpType == 4) {
|
|
|
|
|
- dfOrderService.refundUpdate(request);
|
|
|
|
|
- }else if(erpType == 5){
|
|
|
|
|
- jSTOrderService.refundUpdate(request);
|
|
|
|
|
- }else if(erpType == 6){
|
|
|
|
|
- k9OrderService.refundUpdate(request);
|
|
|
|
|
- }
|
|
|
|
|
- }
|
|
|
|
|
- }
|
|
|
|
|
- } catch (Exception e) {
|
|
|
|
|
-// throw new RuntimeException(e);
|
|
|
|
|
- }
|
|
|
|
|
- }
|
|
|
|
|
} else {
|
|
} else {
|
|
|
//处理支付金额是0元的订单
|
|
//处理支付金额是0元的订单
|
|
|
if (fsStoreOrder.getPayMoney() == null || fsStoreOrder.getPayMoney().compareTo(BigDecimal.ZERO) != 0) {
|
|
if (fsStoreOrder.getPayMoney() == null || fsStoreOrder.getPayMoney().compareTo(BigDecimal.ZERO) != 0) {
|