|
|
@@ -302,16 +302,8 @@ public class FsRewardGoodsOrderServiceImpl extends ServiceImpl<FsRewardGoodsOrde
|
|
|
payments.add(payment);
|
|
|
erpOrder.setPayments(payments);
|
|
|
|
|
|
- //大于100发发顺丰云配
|
|
|
- if (order.getPayMoney().compareTo(new BigDecimal(100)) > 0) {
|
|
|
- //发互联网医院SF.0235488558_241101
|
|
|
- FsExpress express = expressService.selectFsExpressByOmsCode("SF.0235488558_241101");
|
|
|
- erpOrder.setExpress_code(express.getOmsCode());
|
|
|
- order.setDeliveryName(express.getName());
|
|
|
- order.setDeliveryCode(express.getCode());
|
|
|
- } else {
|
|
|
- //发ztpdd
|
|
|
- FsExpress express = expressService.selectFsExpressByOmsCode("CDYJFYD.400011111705_241230");
|
|
|
+ FsExpress express = expressService.selectFsExpressByOmsCode("YUNDA");
|
|
|
+ if (express != null) {
|
|
|
erpOrder.setExpress_code(express.getOmsCode());
|
|
|
order.setDeliveryName(express.getName());
|
|
|
order.setDeliveryCode(express.getCode());
|