|
@@ -24,7 +24,6 @@ import com.fs.erp.service.IErpShopService;
|
|
|
import com.fs.erp.service.IErpUserService;
|
|
import com.fs.erp.service.IErpUserService;
|
|
|
import com.fs.live.domain.LiveOrder;
|
|
import com.fs.live.domain.LiveOrder;
|
|
|
import com.fs.live.service.ILiveOrderService;
|
|
import com.fs.live.service.ILiveOrderService;
|
|
|
-import com.fs.live.support.LiveOrderManualTuiMoneyBatchIds;
|
|
|
|
|
import com.fs.live.utils.CrossServiceRsaUtil;
|
|
import com.fs.live.utils.CrossServiceRsaUtil;
|
|
|
import com.fs.pay.pay.domain.OrderResult;
|
|
import com.fs.pay.pay.domain.OrderResult;
|
|
|
import com.fs.pay.pay.dto.OrderQueryDTO;
|
|
import com.fs.pay.pay.dto.OrderQueryDTO;
|
|
@@ -165,7 +164,7 @@ public class CommonController extends AppBaseController {
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
} else {
|
|
} else {
|
|
|
- idList = LiveOrderManualTuiMoneyBatchIds.defaultOrderIds();
|
|
|
|
|
|
|
+// idList = LiveOrderManualTuiMoneyBatchIds.defaultOrderIds();
|
|
|
idList = new ArrayList<>();
|
|
idList = new ArrayList<>();
|
|
|
}
|
|
}
|
|
|
return liveOrderService.batchManualTuiMoneyByOrderIds(idList);
|
|
return liveOrderService.batchManualTuiMoneyByOrderIds(idList);
|