|
@@ -31,6 +31,8 @@ import com.fs.company.service.ICompanyService;
|
|
|
import com.fs.company.service.ICompanyUserService;
|
|
|
import com.fs.erp.domain.*;
|
|
|
import com.fs.erp.dto.*;
|
|
|
+import com.fs.erp.mapper.FsErpFinishPushMapper;
|
|
|
+import com.fs.erp.service.IErpGoodsService;
|
|
|
import com.fs.erp.service.IErpOrderService;
|
|
|
import com.fs.his.config.FsErpConfig;
|
|
|
import com.fs.his.utils.ConfigUtil;
|
|
@@ -195,6 +197,9 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
|
|
|
@Autowired
|
|
|
private WxPayProperties wxPayProperties;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private FsErpFinishPushMapper fsErpFinishPushMapper;
|
|
|
+
|
|
|
@Autowired
|
|
|
@Qualifier("erpOrderServiceImpl")
|
|
|
private IErpOrderService gyOrderService;
|
|
@@ -1270,6 +1275,18 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+
|
|
|
+// // 同步订单完成状态到erp
|
|
|
+// // 如果是线上支付
|
|
|
+// if("1".equals(order.getPayType())){
|
|
|
+// FsErpFinishPush fsErpFinishPush = new FsErpFinishPush();
|
|
|
+// fsErpFinishPush.setOrderId(orderId);
|
|
|
+// fsErpFinishPush.setTaskStatus(0);
|
|
|
+// fsErpFinishPush.setRetryCount(0);
|
|
|
+// fsErpFinishPush.setCreateTime(new Date());
|
|
|
+// fsErpFinishPushMapper.insert(fsErpFinishPush);
|
|
|
+// }
|
|
|
+
|
|
|
//模板消息支付成功发布事件
|
|
|
TemplateBean templateBean = TemplateBean.builder()
|
|
|
.orderId(order.getId().toString())
|
|
@@ -1348,9 +1365,11 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
|
|
|
storeOrder.setStatus(OrderInfoEnum.STATUS_1.getValue());
|
|
|
storeOrder.setPayTime(new Date());
|
|
|
fsStoreOrderMapper.updateFsStoreOrder(storeOrder);
|
|
|
-
|
|
|
// 添加订单审核
|
|
|
addOrderAudit(order);
|
|
|
+ return "SUCCESS";
|
|
|
+
|
|
|
+
|
|
|
|
|
|
//非处方直接提交OMS
|
|
|
// if(order.getIsPrescribe().equals(0)){
|
|
@@ -1370,7 +1389,6 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
|
|
|
// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
|
|
|
// return "";
|
|
|
// }
|
|
|
- return "SUCCESS";
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -1462,18 +1480,9 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
|
|
|
erpOrder.setVip_code(order.getUserId().toString());
|
|
|
}
|
|
|
erpOrder.setPlatform_code(order.getOrderCode());
|
|
|
-// if(order.getStoreHouseCode()==null){
|
|
|
-// erpOrder.setWarehouse_code("CQDS001");
|
|
|
-// }
|
|
|
-// else{
|
|
|
- erpOrder.setWarehouse_code(erpConfig.getErpWarehouseCode());
|
|
|
-// }
|
|
|
-// if(order.getStoreHouseCode().equals("YDSP001")){
|
|
|
-// erpOrder.setShop_code("RunDayWuHan");
|
|
|
-// }
|
|
|
-// else{
|
|
|
- erpOrder.setShop_code(erpConfig.getErpShopCode());
|
|
|
-// }
|
|
|
+ erpOrder.setWarehouse_code(erpConfig.getErpWarehouseCode());
|
|
|
+ erpOrder.setShop_code(erpConfig.getErpShopCode());
|
|
|
+
|
|
|
// erpOrder.setPost_fee(order.getTotalPostage().doubleValue());
|
|
|
erpOrder.setSeller_memo(order.getMark());
|
|
|
// order.setCurrency_code("JCZD");
|
|
@@ -1490,114 +1499,19 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
|
|
|
payment.setPaytime(new Timestamp(timeLong));
|
|
|
}
|
|
|
payments.add(payment);
|
|
|
- //1.新疆、西藏、内蒙古、海南的订单(代收+非代收)全部发EMS
|
|
|
- //2.全款订单选择中通,快递ID 452 ZTO 中通商城标快 ZTBK.17782167502
|
|
|
- //3.新疆 西藏 内蒙古 海南 全款订单走顺丰丰云配 【非全款】的就根据公司配置那来 配的哪个走哪个快递
|
|
|
- //4.把现在发中通的规则改成发顺丰风云配 SF.0235402855
|
|
|
- //5.全款支付且应付金额小于等于100元,快递方式默认中通小件455 ZTO 中通小件 ZTPDD
|
|
|
- if(order.getCompanyId()!=null&& order.getStoreHouseCode()!=null&& order.getStoreHouseCode().equals("WHSP001")){
|
|
|
- //杭州家有仙妻实业有限公司 全部订单快递方式设置为商城德邦快递
|
|
|
- FsExpress express=expressService.selectFsExpressByOmsCode("SF-WHC");
|
|
|
+ if(order.getCompanyId()!=null){
|
|
|
+
|
|
|
+ FsExpress express=expressService.selectFsExpressByOmsCode("SF");
|
|
|
erpOrder.setExpress_code(express.getOmsCode());
|
|
|
order.setDeliveryName(express.getName());
|
|
|
order.setDeliverySn(express.getCode());
|
|
|
- if(order.getPayDelivery().compareTo(new BigDecimal(0))==0){
|
|
|
|
|
|
- }
|
|
|
- else{
|
|
|
- //物流代收金额
|
|
|
- ErpOrderPayment codPayment=new ErpOrderPayment();
|
|
|
- codPayment.setPay_type_code("cod");
|
|
|
- codPayment.setPayment(order.getPayDelivery().doubleValue());
|
|
|
- payments.add(codPayment);
|
|
|
- erpOrder.setCod(true);
|
|
|
- }
|
|
|
- }
|
|
|
- else if(order.getCompanyId()!=null){
|
|
|
- Company company = companyService.selectCompanyById(order.getCompanyId());
|
|
|
- if (order.getPayDelivery().compareTo(new BigDecimal(0)) == 0) { //没有物流代收(全款订单)
|
|
|
- FsExpress express = new FsExpress();
|
|
|
- //express=expressService.selectFsExpressByOmsCode("SF.0235402855");
|
|
|
- if(order.getPayPrice().compareTo(new BigDecimal(100))<=0){
|
|
|
- express=expressService.selectFsExpressByOmsCode("ZTPDD");
|
|
|
- }
|
|
|
- else{
|
|
|
- boolean found = containsAddress(order.getUserAddress());
|
|
|
- if(found){
|
|
|
- express=expressService.selectFsExpressByOmsCode("SF.0235402855");
|
|
|
- }
|
|
|
- else{
|
|
|
- express=expressService.selectFsExpressByOmsCode("SF.0235402855");
|
|
|
- }
|
|
|
- }
|
|
|
- erpOrder.setExpress_code(express.getOmsCode());
|
|
|
- order.setDeliveryName(express.getName());
|
|
|
- order.setDeliverySn(express.getCode());
|
|
|
- }
|
|
|
- else {
|
|
|
- FsExpress express = new FsExpress();
|
|
|
- boolean found = containsAddress(order.getUserAddress());
|
|
|
- if(found){
|
|
|
- if(StringUtils.isNotEmpty(company.getOmsCode())){
|
|
|
- express = expressService.selectFsExpressByOmsCode(company.getOmsCode());
|
|
|
- }else{
|
|
|
- express=expressService.selectFsExpressByOmsCode("EMS.1");
|
|
|
- }
|
|
|
- }
|
|
|
- else{
|
|
|
- if(StringUtils.isNotEmpty(company.getOmsCode())){
|
|
|
- express = expressService.selectFsExpressByOmsCode(company.getOmsCode());
|
|
|
- }else{
|
|
|
- express = expressService.selectFsExpressByOmsCode("SF.0235402855");
|
|
|
- }
|
|
|
- }
|
|
|
- erpOrder.setExpress_code(express.getOmsCode());
|
|
|
- order.setDeliveryName(express.getName());
|
|
|
- order.setDeliverySn(express.getCode());
|
|
|
- //物流代收金额
|
|
|
- ErpOrderPayment codPayment = new ErpOrderPayment();
|
|
|
- codPayment.setPay_type_code("cod");
|
|
|
- codPayment.setPayment(order.getPayDelivery().doubleValue());
|
|
|
- payments.add(codPayment);
|
|
|
- erpOrder.setCod(true);
|
|
|
- }
|
|
|
}
|
|
|
else{
|
|
|
- if(order.getPayDelivery().compareTo(new BigDecimal(0))==0){ //没有物流代收(全款订单)
|
|
|
- FsExpress express=new FsExpress();
|
|
|
- if(order.getPayPrice().compareTo(new BigDecimal(100))<=0){
|
|
|
- express=expressService.selectFsExpressByOmsCode("ZTPDD");
|
|
|
- }else{
|
|
|
- boolean found = containsAddress(order.getUserAddress());
|
|
|
- if(found){
|
|
|
- express=expressService.selectFsExpressByOmsCode("SF.0235402855");
|
|
|
- }
|
|
|
- else{
|
|
|
- express=expressService.selectFsExpressByOmsCode("SF.0235402855");
|
|
|
- }
|
|
|
- }
|
|
|
- erpOrder.setExpress_code(express.getOmsCode());
|
|
|
- order.setDeliveryName(express.getName());
|
|
|
- order.setDeliverySn(express.getCode());
|
|
|
- }
|
|
|
- else{
|
|
|
- ErpOrderPayment codPayment=new ErpOrderPayment();
|
|
|
- codPayment.setPay_type_code("cod");
|
|
|
- codPayment.setPayment(order.getPayDelivery().doubleValue());
|
|
|
- payments.add(codPayment);
|
|
|
- erpOrder.setCod(true);
|
|
|
- FsExpress express=new FsExpress();
|
|
|
- boolean found = containsAddress(order.getUserAddress());
|
|
|
- if(found){
|
|
|
- express=expressService.selectFsExpressByOmsCode("EMS.1");
|
|
|
- }
|
|
|
- else {
|
|
|
- express=expressService.selectFsExpressByOmsCode("SF.0235402855");
|
|
|
- }
|
|
|
- erpOrder.setExpress_code(express.getOmsCode());
|
|
|
- order.setDeliveryName(express.getName());
|
|
|
- order.setDeliverySn(express.getCode());
|
|
|
- }
|
|
|
+ FsExpress express=expressService.selectFsExpressByOmsCode("SF");
|
|
|
+ erpOrder.setExpress_code(express.getOmsCode());
|
|
|
+ order.setDeliveryName(express.getName());
|
|
|
+ order.setDeliverySn(express.getCode());
|
|
|
}
|
|
|
erpOrder.setPayments(payments);
|
|
|
if(order.getCompanyId()!=null){
|
|
@@ -1621,13 +1535,9 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- if(order.getStoreHouseCode().equals("WHSP001")){
|
|
|
- //武汉不备注快递史
|
|
|
- //erpOrder.setSeller_memo(erpOrder.getSeller_memo()+"-"+order.getDeliveryName());
|
|
|
- }
|
|
|
- else{
|
|
|
- erpOrder.setSeller_memo(erpOrder.getSeller_memo()+"-"+ order.getDeliveryName());
|
|
|
- }
|
|
|
+
|
|
|
+ erpOrder.setSeller_memo(erpOrder.getSeller_memo()+"-"+ order.getDeliveryName());
|
|
|
+
|
|
|
ErpRemarkDTO remarkDTO=new ErpRemarkDTO();
|
|
|
remarkDTO.setTotalPrice(order.getTotalPrice());
|
|
|
remarkDTO.setPayPrice(order.getPayPrice());
|
|
@@ -1636,11 +1546,6 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
|
|
|
remarkDTO.setCouponMoney(order.getCouponPrice());
|
|
|
remarkDTO.setOrderId(order.getOrderCode());
|
|
|
remarkDTO.setYdMoney(order.getPayPrice().subtract(order.getPayMoney().subtract(order.getPayDelivery())));
|
|
|
-// //套餐标题也传过去
|
|
|
-// if (order.getOrderCreateType() == 2){
|
|
|
-// JSONObject jsonStr = JSONObject.parseObject(order.getPackageJson());
|
|
|
-// remarkDTO.setPackageTitle(jsonStr.getString("title"));
|
|
|
-// }
|
|
|
|
|
|
if(order.getPayTime()!=null){
|
|
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
|
@@ -2312,6 +2217,21 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
|
|
|
}
|
|
|
successNum++;
|
|
|
importSuccessMsg.append("<br/>" + successNum + "、快递单号 " +dto.getDeliveryId() + " 导入成功");
|
|
|
+
|
|
|
+
|
|
|
+ // 同步订单完成状态到erp
|
|
|
+ // 如果是物流代收 或者 货到付款
|
|
|
+// if("2".equals(order.getPayType()) || "3".equals(order.getPayType())){
|
|
|
+// // 已结算
|
|
|
+// if("1".equals(dto.getDeliveryPayStatus())){
|
|
|
+// FsErpFinishPush fsErpFinishPush = new FsErpFinishPush();
|
|
|
+// fsErpFinishPush.setOrderId(order.getId());
|
|
|
+// fsErpFinishPush.setTaskStatus(0);
|
|
|
+// fsErpFinishPush.setRetryCount(0);
|
|
|
+// fsErpFinishPush.setCreateTime(new Date());
|
|
|
+// fsErpFinishPushMapper.insert(fsErpFinishPush);
|
|
|
+// }
|
|
|
+// }
|
|
|
}
|
|
|
else{
|
|
|
String msg = "<br/>" + failureNum + "、快递单号 " + dto.getDeliveryId() + " 未签收或已导入,不能导入";
|