记得上下班打卡 | git大法好,push需谨慎

Commit 2a5ee94b authored by 胡佳晨's avatar 胡佳晨

提交 同步订单 方法

parent d47dfbd5
...@@ -79,7 +79,7 @@ public class GoblinOrderSkuVo implements Serializable, Cloneable { ...@@ -79,7 +79,7 @@ public class GoblinOrderSkuVo implements Serializable, Cloneable {
private String erpWarehouseNo; private String erpWarehouseNo;
public String getPushTime() { public String getPushTime() {
return pushTime==null?"":pushTime; return pushTime == null ? "" : pushTime;
} }
public GoblinOrderSkuVo copy(GoblinOrderSku source) { public GoblinOrderSkuVo copy(GoblinOrderSku source) {
...@@ -100,13 +100,11 @@ public class GoblinOrderSkuVo implements Serializable, Cloneable { ...@@ -100,13 +100,11 @@ public class GoblinOrderSkuVo implements Serializable, Cloneable {
this.setSkuSpecs(source.getSkuSpecs()); this.setSkuSpecs(source.getSkuSpecs());
this.setPriceModify(source.getPriceModify()); this.setPriceModify(source.getPriceModify());
this.setPriceVoucher(source.getPriceVoucher()); this.setPriceVoucher(source.getPriceVoucher());
this.setSpuErpCode(source.getSpuErpCode()); this.setSpuErpCode(source.getSpuErpCode());
this.setSkuErpCode(source.getSkuErpCode()); this.setSkuErpCode(source.getSkuErpCode());
this.setErpType(source.getErpType()); this.setErpType(source.getErpType());
this.setErpWarehouseNo(source.getErpWarehouseNo()); this.setErpWarehouseNo(source.getErpWarehouseNo());
this.setErpHosting(source.getErpHosting()); this.setErpHosting(source.getErpHosting());
this.setCreatedAt(source.getCreatedAt().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))); this.setCreatedAt(source.getCreatedAt().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
return this; return this;
} }
......
...@@ -16,6 +16,7 @@ import com.liquidnet.service.erp.vo.StockQueryBaseVo; ...@@ -16,6 +16,7 @@ import com.liquidnet.service.erp.vo.StockQueryBaseVo;
import com.liquidnet.service.erp.vo.StockQueryVo; import com.liquidnet.service.erp.vo.StockQueryVo;
import com.liquidnet.service.erp.vo.SyncStockVo; import com.liquidnet.service.erp.vo.SyncStockVo;
import com.liquidnet.service.erp.vo.TradePushVo; import com.liquidnet.service.erp.vo.TradePushVo;
import com.liquidnet.service.goblin.constant.GoblinStatusConst;
import com.liquidnet.service.goblin.dto.vo.GoblinGoodsInfoVo; import com.liquidnet.service.goblin.dto.vo.GoblinGoodsInfoVo;
import com.liquidnet.service.goblin.dto.vo.GoblinGoodsSkuInfoVo; import com.liquidnet.service.goblin.dto.vo.GoblinGoodsSkuInfoVo;
import com.liquidnet.service.goblin.dto.vo.GoblinOrderSkuVo; import com.liquidnet.service.goblin.dto.vo.GoblinOrderSkuVo;
...@@ -176,10 +177,10 @@ public class WdtServiceImpl implements IGoblinErpService { ...@@ -176,10 +177,10 @@ public class WdtServiceImpl implements IGoblinErpService {
for (String orderSkuId : orderSkuIds) { for (String orderSkuId : orderSkuIds) {
OrderListParam orderSkuParam = OrderListParam.getNew(); OrderListParam orderSkuParam = OrderListParam.getNew();
GoblinOrderSkuVo orderSkuVo = goblinRedisUtils.getGoblinOrderSkuVo(orderSkuId); GoblinOrderSkuVo orderSkuVo = goblinRedisUtils.getGoblinOrderSkuVo(orderSkuId);
if (orderSkuVo.getErpHosting() == 0) { if (orderSkuVo.getErpHosting() == 1 && orderSkuVo.getStatus() == GoblinStatusConst.Status.ORDER_STATUS_2.getValue()) {
continue;
} else {
erpHosting = 1; erpHosting = 1;
} else {
continue;
} }
orderSkuParam.setOid(orderSkuVo.getOrderSkuId()); orderSkuParam.setOid(orderSkuVo.getOrderSkuId());
orderSkuParam.setNum(BigDecimal.valueOf(orderSkuVo.getNum())); orderSkuParam.setNum(BigDecimal.valueOf(orderSkuVo.getNum()));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment