express order finished
This commit is contained in:
@@ -273,9 +273,10 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrderEntity
|
||||
expressOrder.setCommodity(commodityList);
|
||||
expressOrder.setExpressCompanyCode(expressCompanyCode);
|
||||
// 生成快递面单
|
||||
String expressBill = expressOrderService.placeExpressOrder(address, expressOrder);
|
||||
Map<String, String> result = expressOrderService.placeExpressOrder(address, expressOrder);
|
||||
for (BuyOrderDetail buyOrderDetail : buyOrderDetailList) {
|
||||
buyOrderDetail.setExpressBill(expressBill);
|
||||
buyOrderDetail.setExpressBill(result.get("expressBill"));
|
||||
buyOrderDetail.setExpressBillNo(result.get("expressBillNo"));
|
||||
}
|
||||
buyOrderDetailService.saveBatch(buyOrderDetailList);
|
||||
}
|
||||
|
||||
@@ -11,6 +11,7 @@ import com.peanut.modules.book.entity.*;
|
||||
import com.peanut.modules.book.service.*;
|
||||
import com.peanut.modules.book.vo.ExpressOrderRequestVo;
|
||||
import com.peanut.modules.book.vo.ExpressOrderResponseVo;
|
||||
import com.peanut.modules.book.vo.ExpressQueryResponseVo;
|
||||
import com.peanut.modules.book.vo.ExpressUserInfoVo;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
@@ -51,7 +52,7 @@ public class ExpressOrderServiceImpl extends ServiceImpl<ExpressOrderDao, Expres
|
||||
|
||||
|
||||
@Override
|
||||
public String placeExpressOrder(UserAddress userAddress, ExpressOrder expressOrder) {
|
||||
public Map<String, String> placeExpressOrder(UserAddress userAddress, ExpressOrder expressOrder) {
|
||||
ExpressOrderRequestVo orderRequestVo = new ExpressOrderRequestVo();
|
||||
// 订单号
|
||||
orderRequestVo.setOrderCode(expressOrder.getOrderId().toString());
|
||||
@@ -95,7 +96,17 @@ public class ExpressOrderServiceImpl extends ServiceImpl<ExpressOrderDao, Expres
|
||||
params.put("DataType", "2");
|
||||
String response = HttpClientUtils.kdSendPost(Constants.EXPRESS_PLACE_ORDER_URL, params);
|
||||
ExpressOrderResponseVo responseVo = JSONObject.parseObject(response, ExpressOrderResponseVo.class);
|
||||
return responseVo.getPrintTemplate();
|
||||
String expressBillNo = responseVo.getOrder().getLogisticCode();
|
||||
Map<String, String> result = new HashMap<>();
|
||||
result.put("expressBillNo", expressBillNo);
|
||||
result.put("template", responseVo.getPrintTemplate());
|
||||
return result;
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public ExpressQueryResponseVo queryExpressOrder(String ShipperCode, String LogisticCode) {
|
||||
return null;
|
||||
}
|
||||
|
||||
private ExpressUserInfoVo buildReceiverBasedOnUserAddress(UserAddress userAddress) {
|
||||
|
||||
Reference in New Issue
Block a user