订单管理

@@ -21,4 +21,6 @@ public interface BuyerOrderMapper {
 	int updateStatusById(@Param("id") Integer id, @Param("status") Byte status);
 	
 	BuyerOrder selectByOrderCode(@Param("orderCode") String orderCode);
+	
+	BuyerOrder selectById(@Param("id") Integer id);
 }

@@ -54,6 +54,10 @@ public class BuyerOrderReq extends PageRequestBO{
 	
 	private String receiveAreaCode;
 	
+	private Integer expressCompanyId;
+	
+	private String waybillCode;
+	
     public Integer getId() {
 		return id;
 	}
@@ -214,6 +218,22 @@ public class BuyerOrderReq extends PageRequestBO{
 		this.receiveAreaCode = receiveAreaCode;
 	}
 
+	public Integer getExpressCompanyId() {
+		return expressCompanyId;
+	}
+
+	public void setExpressCompanyId(Integer expressCompanyId) {
+		this.expressCompanyId = expressCompanyId;
+	}
+
+	public String getWaybillCode() {
+		return waybillCode;
+	}
+
+	public void setWaybillCode(String waybillCode) {
+		this.waybillCode = waybillCode;
+	}
+
 	public String toString() {
         return "BuyerOrderListReq{" + '\'' +
         		"orderCode=" + orderCode + '\'' +
@@ -233,6 +253,8 @@ public class BuyerOrderReq extends PageRequestBO{
                 "receiveAddressDetail=" + receiveAddressDetail + '\'' +
                 "receiveZipCode=" + receiveZipCode + '\'' +
                 "receiveAreaCode=" + receiveAreaCode + '\'' +
+                "expressCompanyId=" + expressCompanyId + '\'' +
+                "waybillCode=" + waybillCode + '\'' +
                 '}';
     }
 }

@@ -28,6 +28,11 @@
         from buyer_order where order_code = #{orderCode}
     </select>
     
+    <select id="selectById" resultMap="BaseResultMap">
+        select <include refid="Base_Column_List" />
+        from buyer_order where id = #{id}
+    </select>
+    
     <select id="selectCountByStatus" resultType="java.lang.Integer">
         select count(1)   
         from buyer_order where 1=1 

@@ -49,6 +49,7 @@ import com.yoho.ufo.order.constant.Constant;
 import com.yoho.ufo.order.service.IBuyerOrderService;
 import com.yoho.ufo.service.impl.UserHelper;
 import com.yoho.ufo.service.model.PageResponseBO;
+import com.yohobuy.ufo.model.order.bo.AppraiseExpressInfoBo;
 import com.yohobuy.ufo.model.order.resp.BuyerOrderResp;
 import com.yohobuy.ufo.model.order.resp.ExpressInfoResp;
 import com.yohobuy.ufo.model.order.resp.OrderDetailResp;
@@ -216,6 +217,31 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
     		return 0;
     	}
     	
+    	BuyerOrder buyerOrder = buyerOrderMapper.selectById(req.getId());
+    	if(null == buyerOrder) {
+    		return 0;
+    	}
+    	
+    	//调用前台接口
+    	String args = "";
+    	if(req.getStatus().byteValue() == Constant.BUYER_ORDER_STATUS_TO_BE_RECEIVED.getByteVal()) {
+    		args = "orderAppraise.appraiseSuccess";
+    	}else if(req.getStatus().byteValue() == Constant.BUYER_ORDER_STATUS_JUDGE_NOT_PASS.getByteVal()) {
+    		args = "orderAppraise.appraiseFail";
+    	}
+    	
+    	if(StringUtils.isNotEmpty(args)) {
+    		AppraiseExpressInfoBo bo = new AppraiseExpressInfoBo();
+        	bo.setOrderCode(Long.valueOf(buyerOrder.getOrderCode()));
+        	bo.setExpressCompanyId(req.getExpressCompanyId());
+        	bo.setWayBillCode(req.getWaybillCode());
+        	JSONObject jsonObject = serviceCaller.call(args, bo, JSONObject.class);
+        	LOGGER.info("call orderAppraise result is {}", jsonObject.toJSONString());
+        	if(jsonObject.getIntValue("code") != 200) {
+        		return 0;
+        	}
+    	}
+    	
     	return buyerOrderMapper.updateStatusById(req.getId(), req.getStatus());
     }
     

@@ -480,9 +480,9 @@ function deliverGoods(id){
 }
 
 function sendBackGoods(id){
-	var expressCompany = $("#expressCompany").myCombobox("getValue");
+	var expressCompanyId = $("#expressCompany").myCombobox("getValue");
 	var waybillCode = $("#waybillCode").textbox("getValue");
-	if(expressCompany==''){
+	if(expressCompanyId==''){
 		alert("请选择快递公司！");
 		return;
 	}
@@ -493,7 +493,7 @@ function sendBackGoods(id){
 	$.post(contextPath + "/buyerOrder/updateOrderStatus", {
         id : id,
         status : 13,
-        expressCompay : expressCompany,
+        expressCompanyId : expressCompanyId,
         waybillCode : waybillCode
     }, function(data) {
         if (data.code == 200) {