From 09380bbe3798232494c96553b769a935606bf326 Mon Sep 17 00:00:00 2001 From: Nicky Liang Date: Mon, 15 Oct 2018 17:02:41 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E8=B4=9F=E8=B4=A3=E4=BA=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../interfaces/backend/service/CallOrderByHYCServiceImpl.java | 3 ++- .../backend/service/CheckIntermediateServiceImpl.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/erp-hyc-interfaces-backend/src/main/java/com/unlcn/erp/hyc/interfaces/backend/service/CallOrderByHYCServiceImpl.java b/erp-hyc-interfaces-backend/src/main/java/com/unlcn/erp/hyc/interfaces/backend/service/CallOrderByHYCServiceImpl.java index f91177a..1256a32 100644 --- a/erp-hyc-interfaces-backend/src/main/java/com/unlcn/erp/hyc/interfaces/backend/service/CallOrderByHYCServiceImpl.java +++ b/erp-hyc-interfaces-backend/src/main/java/com/unlcn/erp/hyc/interfaces/backend/service/CallOrderByHYCServiceImpl.java @@ -1,6 +1,5 @@ package com.unlcn.erp.hyc.interfaces.backend.service; -import com.alibaba.dubbo.common.utils.CollectionUtils; import com.alibaba.fastjson.JSONObject; import com.unlcn.erp.hyc.interfaces.backend.bo.HYCOrderDB; import com.unlcn.erp.hyc.interfaces.backend.bo.OrderCodesDB; @@ -10,6 +9,7 @@ import com.unlcn.erp.hyc.interfaces.base.mapper.HycbackMapper; import com.unlcn.erp.hyc.interfaces.base.mapper.HycorderMapper; import com.unlcn.erp.hyc.interfaces.base.mapper.SoorderMapper; import com.unlcn.erp.hyc.interfaces.base.model.*; +import org.apache.commons.collections.CollectionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.BeanUtils; @@ -192,6 +192,7 @@ public class CallOrderByHYCServiceImpl implements CallOrderByHYCService{ soorder.setVcuserno("system"); }else { soorder.setVcuserno(db.getUsername()); + soorder.setVcreceiveduty(db.getUsername()); } soorder.setDtdate(db.getCreatetime()); soorder.setVcaddress(db.getDepartaddr()); diff --git a/erp-hyc-interfaces-backend/src/main/java/com/unlcn/erp/hyc/interfaces/backend/service/CheckIntermediateServiceImpl.java b/erp-hyc-interfaces-backend/src/main/java/com/unlcn/erp/hyc/interfaces/backend/service/CheckIntermediateServiceImpl.java index cb7f149..f7522f7 100644 --- a/erp-hyc-interfaces-backend/src/main/java/com/unlcn/erp/hyc/interfaces/backend/service/CheckIntermediateServiceImpl.java +++ b/erp-hyc-interfaces-backend/src/main/java/com/unlcn/erp/hyc/interfaces/backend/service/CheckIntermediateServiceImpl.java @@ -1,9 +1,10 @@ package com.unlcn.erp.hyc.interfaces.backend.service; -import com.alibaba.dubbo.common.utils.CollectionUtils; + import com.unlcn.erp.hyc.interfaces.backend.enums.ExceptionMsgTypeEnum; import com.unlcn.erp.hyc.interfaces.base.mapper.*; import com.unlcn.erp.hyc.interfaces.base.model.*; +import org.apache.commons.collections.CollectionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -- Gitee From 33dbb4f3e3285cf829d6946889688a2476df4120 Mon Sep 17 00:00:00 2001 From: Nicky Liang Date: Mon, 15 Oct 2018 18:29:51 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E8=BF=90?= =?UTF-8?q?=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- erp-hyc-interfaces-backend/pom.xml | 6 ++++++ .../backend/service/CallOrderByHYCServiceImpl.java | 2 ++ .../backend/service/CallWayBillByHYCServiceImpl.java | 9 +++++++-- .../src/main/resources/mappers/SoorderMapper.xml | 5 ++++- 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/erp-hyc-interfaces-backend/pom.xml b/erp-hyc-interfaces-backend/pom.xml index aca46a2..265927c 100644 --- a/erp-hyc-interfaces-backend/pom.xml +++ b/erp-hyc-interfaces-backend/pom.xml @@ -91,6 +91,12 @@ joda-time 2.9.9 + + com.google.guava + guava + 21.0 + compile + diff --git a/erp-hyc-interfaces-backend/src/main/java/com/unlcn/erp/hyc/interfaces/backend/service/CallOrderByHYCServiceImpl.java b/erp-hyc-interfaces-backend/src/main/java/com/unlcn/erp/hyc/interfaces/backend/service/CallOrderByHYCServiceImpl.java index 1256a32..5d272fd 100644 --- a/erp-hyc-interfaces-backend/src/main/java/com/unlcn/erp/hyc/interfaces/backend/service/CallOrderByHYCServiceImpl.java +++ b/erp-hyc-interfaces-backend/src/main/java/com/unlcn/erp/hyc/interfaces/backend/service/CallOrderByHYCServiceImpl.java @@ -276,6 +276,8 @@ public class CallOrderByHYCServiceImpl implements CallOrderByHYCService{ LOGGER.error("该订单好现金标记为NULL："+db.getOrdercode()); } soorder.setDcpay(db.getCost()); + + /** 如果在慧运车中做收款，则打开 if(db.getPaystatus() == 30){ //10, "未支付",20, "待支付",30, "已支付" soorder.setDcpayed(db.getCost()); diff --git a/erp-hyc-interfaces-backend/src/main/java/com/unlcn/erp/hyc/interfaces/backend/service/CallWayBillByHYCServiceImpl.java b/erp-hyc-interfaces-backend/src/main/java/com/unlcn/erp/hyc/interfaces/backend/service/CallWayBillByHYCServiceImpl.java index c1fa1e9..4a17b1f 100644 --- a/erp-hyc-interfaces-backend/src/main/java/com/unlcn/erp/hyc/interfaces/backend/service/CallWayBillByHYCServiceImpl.java +++ b/erp-hyc-interfaces-backend/src/main/java/com/unlcn/erp/hyc/interfaces/backend/service/CallWayBillByHYCServiceImpl.java @@ -1,7 +1,6 @@ package com.unlcn.erp.hyc.interfaces.backend.service; -import com.alibaba.dubbo.common.utils.CollectionUtils; -import com.alibaba.dubbo.common.utils.StringUtils; + import com.alibaba.fastjson.JSONObject; import com.google.common.collect.Maps; import com.unlcn.erp.hyc.interfaces.backend.bo.HYCWayBillDB; @@ -10,11 +9,13 @@ import com.unlcn.erp.hyc.interfaces.backend.bo.OrderCodesDB; import com.unlcn.erp.hyc.interfaces.backend.enums.CallHYCUrlTypeEnum; import com.unlcn.erp.hyc.interfaces.base.mapper.*; import com.unlcn.erp.hyc.interfaces.base.model.*; +import org.apache.commons.collections.CollectionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.util.StringUtils; import java.math.BigDecimal; import java.util.*; @@ -442,9 +443,11 @@ public class CallWayBillByHYCServiceImpl implements CallWayBillByHYCService{ if(startCity.getVccityname().equals(soorder.getVcstartcity()) && endCity.getVccityname().equals(soorder.getVccityname())){ if("中联物流自有车队".equals(db.getCarriername()) || db.getCarrierid() == 151){ soorder.setIsdispatch((short)1); + soorder.setDcshipedqty((short)1); soorder.setHycwaybillcode(hycwaybilldetail.getWaybillcode()); }else{ soorder.setIsdispatch((short)0); + soorder.setDcshipedqty((short)1); } soorderMapper.updateDispatchByPrimaryKey(soorder); return iorderId; @@ -478,9 +481,11 @@ public class CallWayBillByHYCServiceImpl implements CallWayBillByHYCService{ if("中联物流自有车队".equals(db.getCarriername()) || db.getCarrierid() == 151){ soorder.setIsdispatch((short)1); + soorder.setDcshipedqty((short)0); soorder.setHycwaybillcode(hycwaybilldetail.getWaybillcode()); }else{ soorder.setIsdispatch((short)0); + soorder.setDcshipedqty((short)0); } SoorderExample example = new SoorderExample(); diff --git a/erp-hyc-interfaces-base/src/main/resources/mappers/SoorderMapper.xml b/erp-hyc-interfaces-base/src/main/resources/mappers/SoorderMapper.xml index 9b5454e..5c17c17 100644 --- a/erp-hyc-interfaces-base/src/main/resources/mappers/SoorderMapper.xml +++ b/erp-hyc-interfaces-base/src/main/resources/mappers/SoorderMapper.xml @@ -1373,7 +1373,9 @@ - update SOORDER set ISDISPATCH = #{isdispatch,jdbcType=DECIMAL},HYCWAYBILLCODE = #{hycwaybillcode,jdbcType=VARCHAR} where ilineid = #{ilineid,jdbcType=DECIMAL} + update SOORDER set ISDISPATCH = #{isdispatch,jdbcType=DECIMAL},HYCWAYBILLCODE = #{hycwaybillcode,jdbcType=VARCHAR}, + DCSHIPEDQTY = #{dcshipedqty} + where ilineid = #{ilineid,jdbcType=DECIMAL} @@ -1444,6 +1446,7 @@ update SOORDER set IPAYID = #{ipayid,jdbcType=DECIMAL},DCPAY = #{dcpay,jdbcType=DECIMAL},DCPAYED = #{dcpayed,jdbcType=DECIMAL}, + IPAYID2 = #{ipayid2,jdbcType=DECIMAL}, -- Gitee