ufo / ufo-platform · Commits

Go to a project

Authored by qinchao
Commit b9d318547578dffe99c85c272c0b133013bc25dd 2 parents e15104b8 11e79b0c

Merge branch 'hotfix_erp_addMobile_1218' into test6.8.4

Inline Side-by-side
Showing 4 changed files with 31 additions and 1 deletions
@@ -325,7 +325,13 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService { @@ -325,7 +325,13 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
325 bo.setExpressCompanyId(req.getExpressCompanyId()); 325 bo.setExpressCompanyId(req.getExpressCompanyId());
326 bo.setWayBillCode(req.getWaybillCode()); 326 bo.setWayBillCode(req.getWaybillCode());
327 bo.setDepotNum(req.getDepotNo()); 327 bo.setDepotNum(req.getDepotNo());
328 - LOGGER.info("callAppraise orderCode is {}, startTime is {}", orderCode, DateUtil.getCurrentTimeSecond()); 328 + bo.setMobile(req.getMobile());
  329 +
  330 + if(StringUtils.isBlank(bo.getMobile())){
  331 + throw new ServiceException(400,"错误：物流收货人手机号不能为空！");
  332 + }
  333 +
  334 + LOGGER.info("callAppraise orderCode is {}, AppraiseExpressInfoBo is {}, startTime is {}", orderCode, bo ,DateUtil.getCurrentTimeSecond());
329 335
330 JSONObject jsonObject = serviceCaller.asyncCall(args, bo, JSONObject.class).get(5, TimeUnit.SECONDS); 336 JSONObject jsonObject = serviceCaller.asyncCall(args, bo, JSONObject.class).get(5, TimeUnit.SECONDS);
331 LOGGER.info("callAppraise orderCode is {}, endTime is {}", orderCode, DateUtil.getCurrentTimeSecond()); 337 LOGGER.info("callAppraise orderCode is {}, endTime is {}", orderCode, DateUtil.getCurrentTimeSecond());
@@ -750,6 +750,7 @@ function addQueryPage(skup, order_code, id) { @@ -750,6 +750,7 @@ function addQueryPage(skup, order_code, id) {
750 function deliverGoods(id){ 750 function deliverGoods(id){
751 var expressCompanyId = $("#expressCompany").myCombobox("getValue"); 751 var expressCompanyId = $("#expressCompany").myCombobox("getValue");
752 var waybillCode = $("#waybillCode").textbox("getValue"); 752 var waybillCode = $("#waybillCode").textbox("getValue");
  753 + var mobile = $("#receiveInfo_mobile").val();
753 if(expressCompanyId==''){ 754 if(expressCompanyId==''){
754 alert("请选择快递公司！"); 755 alert("请选择快递公司！");
755 return; 756 return;
@@ -758,11 +759,16 @@ function deliverGoods(id){ @@ -758,11 +759,16 @@ function deliverGoods(id){
758 alert("请填写快递单号！"); 759 alert("请填写快递单号！");
759 return; 760 return;
760 } 761 }
  762 + if(!mobile){
  763 + alert("收货人手机号为空！");
  764 + return;
  765 + }
761 $.post(contextPath + "/buyerOrder/updateOrderStatus", { 766 $.post(contextPath + "/buyerOrder/updateOrderStatus", {
762 id : id, 767 id : id,
763 status : 4, 768 status : 4,
764 expressCompanyId : expressCompanyId, 769 expressCompanyId : expressCompanyId,
765 waybillCode : waybillCode, 770 waybillCode : waybillCode,
  771 + mobile:mobile,
766 depotNo: $("#depotNo").combobox("getValue") 772 depotNo: $("#depotNo").combobox("getValue")
767 }, function(data) { 773 }, function(data) {
768 if (data.code == 200) { 774 if (data.code == 200) {
@@ -785,6 +791,7 @@ function deliverGoods(id){ @@ -785,6 +791,7 @@ function deliverGoods(id){
785 function reBackGoods(id){ 791 function reBackGoods(id){
786 var expressCompanyId = $("#expressCompany").myCombobox("getValue"); 792 var expressCompanyId = $("#expressCompany").myCombobox("getValue");
787 var waybillCode = $("#waybillCode").textbox("getValue"); 793 var waybillCode = $("#waybillCode").textbox("getValue");
  794 + var mobile = $("#sendBackInfo_mobile").val();
788 if(expressCompanyId==''){ 795 if(expressCompanyId==''){
789 alert("请选择快递公司！"); 796 alert("请选择快递公司！");
790 return; 797 return;
@@ -793,11 +800,16 @@ function reBackGoods(id){ @@ -793,11 +800,16 @@ function reBackGoods(id){
793 alert("请填写快递单号！"); 800 alert("请填写快递单号！");
794 return; 801 return;
795 } 802 }
  803 + if(!mobile){
  804 + alert("收货人手机号为空！");
  805 + return;
  806 + }
796 $.post(contextPath + "/buyerOrder/returnBackOrder", { 807 $.post(contextPath + "/buyerOrder/returnBackOrder", {
797 id : id, 808 id : id,
798 status : 17, 809 status : 17,
799 expressCompanyId : expressCompanyId, 810 expressCompanyId : expressCompanyId,
800 waybillCode : waybillCode, 811 waybillCode : waybillCode,
  812 + mobile:mobile,
801 depotNo: $("#depotNo").combobox("getValue") 813 depotNo: $("#depotNo").combobox("getValue")
802 }, function(data) { 814 }, function(data) {
803 if (data.code == 200) { 815 if (data.code == 200) {
@@ -818,6 +830,7 @@ function reBackGoods(id){ @@ -818,6 +830,7 @@ function reBackGoods(id){
818 function sendBackGoods(id){ 830 function sendBackGoods(id){
819 var expressCompanyId = $("#expressCompany").myCombobox("getValue"); 831 var expressCompanyId = $("#expressCompany").myCombobox("getValue");
820 var waybillCode = $("#waybillCode").textbox("getValue"); 832 var waybillCode = $("#waybillCode").textbox("getValue");
  833 + var mobile = $("#sendBackInfo_mobile").val();
821 if(expressCompanyId==''){ 834 if(expressCompanyId==''){
822 alert("请选择快递公司！"); 835 alert("请选择快递公司！");
823 return; 836 return;
@@ -826,11 +839,16 @@ function sendBackGoods(id){ @@ -826,11 +839,16 @@ function sendBackGoods(id){
826 alert("请填写快递单号！"); 839 alert("请填写快递单号！");
827 return; 840 return;
828 } 841 }
  842 + if(!mobile){
  843 + alert("收货人手机号为空！");
  844 + return;
  845 + }
829 $.post(contextPath + "/buyerOrder/updateOrderStatus", { 846 $.post(contextPath + "/buyerOrder/updateOrderStatus", {
830 id : id, 847 id : id,
831 status : 13, 848 status : 13,
832 expressCompanyId : expressCompanyId, 849 expressCompanyId : expressCompanyId,
833 waybillCode : waybillCode, 850 waybillCode : waybillCode,
  851 + mobile:mobile,
834 depotNo: $("#depotNo").combobox("getValue") 852 depotNo: $("#depotNo").combobox("getValue")
835 }, function(data) { 853 }, function(data) {
836 if (data.code == 200) { 854 if (data.code == 200) {
@@ -12,6 +12,7 @@ @@ -12,6 +12,7 @@
12 <tr> 12 <tr>
13 <td>买家地址：</td> 13 <td>买家地址：</td>
14 <td colspan="2" > 14 <td colspan="2" >
  15 + <input type="hidden" id="receiveInfo_mobile"/>
15 <span id="receiveInfo"></span> 16 <span id="receiveInfo"></span>
16 </td> 17 </td>
17 </tr> 18 </tr>
@@ -57,6 +58,8 @@ @@ -57,6 +58,8 @@
57 var name = result.data.receiveName; 58 var name = result.data.receiveName;
58 var mobile = result.data.receiveMobile; 59 var mobile = result.data.receiveMobile;
59 var address = result.data.receiveAddress; 60 var address = result.data.receiveAddress;
  61 +
  62 + $("#receiveInfo_mobile").val(mobile);
60 $("#receiveInfo").html("姓名：" + name + "<br>" + "手机号：" + mobile + "<br>" + "地址：" + address + "&nbsp;<button id='addressCopy'>复制</button>"); 63 $("#receiveInfo").html("姓名：" + name + "<br>" + "手机号：" + mobile + "<br>" + "地址：" + address + "&nbsp;<button id='addressCopy'>复制</button>");
61 64
62 new ClipboardJS('#addressCopy', { 65 new ClipboardJS('#addressCopy', {
@@ -12,6 +12,7 @@ @@ -12,6 +12,7 @@
12 <tr> 12 <tr>
13 <td>商品寄回地址：</td> 13 <td>商品寄回地址：</td>
14 <td colspan="2" > 14 <td colspan="2" >
  15 + <input type="hidden" id="sendBackInfo_mobile">
15 <span id="sendBackInfo"></span> 16 <span id="sendBackInfo"></span>
16 </td> 17 </td>
17 </tr> 18 </tr>
@@ -57,6 +58,8 @@ @@ -57,6 +58,8 @@
57 var name = result.data.receiveName; 58 var name = result.data.receiveName;
58 var mobile = result.data.receiveMobile; 59 var mobile = result.data.receiveMobile;
59 var address = result.data.receiveAddress; 60 var address = result.data.receiveAddress;
  61 +
  62 + $("#sendBackInfo_mobile").val(mobile);
60 $("#sendBackInfo").html("姓名：" + name + "<br>" + "手机号：" + mobile + "<br>" + "地址：" + address + "&nbsp;<button id='rejectAddressCopy'>复制</button>"); 63 $("#sendBackInfo").html("姓名：" + name + "<br>" + "手机号：" + mobile + "<br>" + "地址：" + address + "&nbsp;<button id='rejectAddressCopy'>复制</button>");
61 64
62 new ClipboardJS('#rejectAddressCopy', { 65 new ClipboardJS('#rejectAddressCopy', {