ufo / ufo-platform · Commits

Go to a project

Authored by caoyan
Commit afce094a52dfbfafa6919f86a962d6cbecc02a92 1 parent c98356a7

一个运单号对应多个订单

Inline Side-by-side
Showing 1 changed file with 3 additions and 12 deletions
... ... @@ -21,7 +21,6 @@ import org.springframework.stereotype.Service;
import com.alibaba.fastjson.JSONObject;
import com.yoho.core.common.utils.DateUtil;
import com.yoho.core.rest.client.ServiceCaller;
import com.yoho.core.rest.governance.ServiceStragetyFinder;
import com.yoho.order.dal.AppraiseAddressMapper;
import com.yoho.order.dal.AreaMapper;
import com.yoho.order.dal.BuyerOrderGoodsMapper;
... ... @@ -113,9 +112,6 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
@Autowired
private ServiceCaller serviceCaller;
@Autowired
private ServiceStragetyFinder serviceStragetyFinder;
private static final String BUYER_ORDER_META_KEY_DELIVERY_ADDRESS = "delivery_address";
private static final String SELLER_ORDER_META_KEY_BACK_DELIVERY_ADDRESS = "back_delivery_address";
... ... @@ -347,7 +343,7 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
resp.setOrderCode(buyerOrder.getOrderCode());
resp.setStatus(buyerOrder.getStatus());
resp.setStatusStr(convertOrderStatus(buyerOrder.getStatus()));
resp.setPayStatus(buyerOrder.getStatus().byteValue() == Constant.BUYER_ORDER_STATUS_BUYER_NOT_PAY.getByteVal() ? "未支付" : "已支付");//支付状态
resp.setPayStatus("未支付");//支付状态
resp.setCreateTimeStr(DateUtil.long2DateStr(buyerOrder.getCreateTime().longValue()*1000, "yyyy-MM-dd HH:mm:ss"));
resp.setBuyerUid(buyerOrder.getUid());
... ... @@ -359,6 +355,7 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
OrdersPay ordersPay = ordersPayMapper.selectByOrderCode(buyerOrder.getOrderCode());
if(null != ordersPay) {
resp.setPayTime(DateUtil.long2DateStr(ordersPay.getCreateTime().longValue()*1000, "yyyy-MM-dd HH:mm:ss"));
resp.setPayStatus("已支付");
}
}
... ... @@ -494,12 +491,6 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
return Lists.newArrayList();
}
// if(parentCode.length() == 6 && parentCode.substring(2, 6).equals("0000")) {
// parentCode = parentCode.substring(0, 2);
// }else if(parentCode.length() == 6 && parentCode.substring(4,6).equals("00")) {
// parentCode = parentCode.substring(0, 4);
// }
List<Area> areaList = areaMapper.selectByParentCode(parentCode);
List<JSONObject> result = new ArrayList<>();
for (Area area : areaList) {
... ... @@ -747,7 +738,7 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
}
// if(StringUtils.isNotEmpty(req.getSellerWaybillCode())) {
// List<ExpressRecord> expressRecordList = expressRecordMapper.selectByWaybillCode(req.getSellerWaybillCode());
// List<ExpressRecord> expressRecordList = expressoRecordMapper.selectByWaybillCode(req.getSellerWaybillCode());
// if(CollectionUtils.isEmpty(expressRecordList)) {
// return false;
// }else {
... ...