ufo / ufo-platform · Commits

Go to a project

Authored by caoyan
Commit aac33d15516d638f5d6ef6097307a8580e05304d 1 parent c96a9be6

确认收货优化

Inline Side-by-side
Showing 2 changed files with 22 additions and 16 deletions
@@ -24,7 +24,7 @@ @@ -24,7 +24,7 @@
24 24
25 <select id="selectBySellerWaybillCode" resultMap="BaseResultMap"> 25 <select id="selectBySellerWaybillCode" resultMap="BaseResultMap">
26 select <include refid="Base_Column_List" /> 26 select <include refid="Base_Column_List" />
27 - from abnormal_package where seller_waybillCode = #{sellerWaybillCode} 27 + from abnormal_package where is_del=0 and seller_waybillCode = #{sellerWaybillCode}
28 </select> 28 </select>
29 29
30 <insert id="insert" parameterType="com.yoho.order.model.AbnormalPackage"> 30 <insert id="insert" parameterType="com.yoho.order.model.AbnormalPackage">
@@ -680,6 +680,23 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService { @@ -680,6 +680,23 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
680 return jsonObject; 680 return jsonObject;
681 } 681 }
682 682
  683 + //计算附加信息
  684 + buildExtraInfo(jsonObject, orderList, sellerWaybillCode);
  685 +
  686 + List<BuyerOrderResp> respList = buildBuyerOrderRespForQc(orderList);
  687 + if(CollectionUtils.isEmpty(respList)) {
  688 + return jsonObject;
  689 + }
  690 +
  691 + result.setPage(1);
  692 + result.setList(respList);
  693 + result.setSize(respList.size());
  694 + result.setTotal(respList.size());
  695 +
  696 + return jsonObject;
  697 + }
  698 +
  699 + private void buildExtraInfo(JSONObject jsonObject, List<BuyerOrder> orderList, String sellerWaybillCode){
683 jsonObject.replace("orderNum", orderList.size()); 700 jsonObject.replace("orderNum", orderList.size());
684 701
685 //是否是异常包裹 702 //是否是异常包裹
@@ -693,7 +710,7 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService { @@ -693,7 +710,7 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
693 int receivedNum = 0; 710 int receivedNum = 0;
694 for(BuyerOrder order : orderList) { 711 for(BuyerOrder order : orderList) {
695 if(order.getStatus().equals(Constant.BUYER_ORDER_STATUS_BUYER_CANCEL_AFTER_SELLER_DELIVERY.getByteVal()) 712 if(order.getStatus().equals(Constant.BUYER_ORDER_STATUS_BUYER_CANCEL_AFTER_SELLER_DELIVERY.getByteVal())
696 - || order.getStatus().equals(Constant.CS_CANCEL_AUTO_BEFORE_DEPOT_RECEIVE.getByteVal())) { 713 + || order.getStatus().equals(Constant.CS_CANCEL_BEFORE_DEPOT_RECEIVE.getByteVal())) {
697 canceledNum += 1; 714 canceledNum += 1;
698 }else if(!order.getStatus().equals(Constant.BUYER_ORDER_STATUS_ALLOCATING.getByteVal())){ 715 }else if(!order.getStatus().equals(Constant.BUYER_ORDER_STATUS_ALLOCATING.getByteVal())){
699 receivedNum +=1; 716 receivedNum +=1;
@@ -703,25 +720,14 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService { @@ -703,25 +720,14 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
703 if(canceledNum > 0) { 720 if(canceledNum > 0) {
704 jsonObject.replace("exceptionBtn", jsonObject.getIntValue("isExceptionPackage") == 1 ? 0: 1);//0：按钮不展示 1：按钮展示 721 jsonObject.replace("exceptionBtn", jsonObject.getIntValue("isExceptionPackage") == 1 ? 0: 1);//0：按钮不展示 1：按钮展示
705 jsonObject.replace("canceledNum", canceledNum); 722 jsonObject.replace("canceledNum", canceledNum);
  723 + jsonObject.replace("receiveBtn", 0);
706 } 724 }
707 725
708 jsonObject.replace("receivedNum", receivedNum); 726 jsonObject.replace("receivedNum", receivedNum);
709 - if(receivedNum != orderList.size()){ 727 + if(orderList.size() - receivedNum - canceledNum > 0 && canceledNum == 0){
710 jsonObject.replace("receiveBtn", jsonObject.getIntValue("isExceptionPackage") == 1 ? 0: 1);//0：按钮不展示 1：按钮展示 728 jsonObject.replace("receiveBtn", jsonObject.getIntValue("isExceptionPackage") == 1 ? 0: 1);//0：按钮不展示 1：按钮展示
711 } 729 }
712 -  
713 - List<BuyerOrderResp> respList = buildBuyerOrderRespForQc(orderList);  
714 - if(CollectionUtils.isEmpty(respList)) {  
715 - return jsonObject;  
716 - }  
717 -  
718 - result.setPage(1);  
719 - result.setList(respList);  
720 - result.setSize(respList.size());  
721 - result.setTotal(respList.size());  
722 -  
723 - return jsonObject;  
724 - } 730 + }
725 731
726 private void buildIsSignForPackage(List<BuyerOrderResp> respList, String sellerWaybillCode) { 732 private void buildIsSignForPackage(List<BuyerOrderResp> respList, String sellerWaybillCode) {
727 BuyerOrderReq buyerOrderReq = new BuyerOrderReq(); 733 BuyerOrderReq buyerOrderReq = new BuyerOrderReq();