ufo / yohoufo-fore · Commits

Go to a project

Authored by mali
Commit 0eb2ac6a2e9fc7c7339084e3c88e8443739160a2 2 parents caff40f9 1630fe7c

Merge branch 'test6.9.10' of http://git.yoho.cn/ufo/yohoufo-fore into test6.9.10

Inline Side-by-side
Showing 5 changed files with 35 additions and 17 deletions
... ... @@ -12,4 +12,15 @@ public interface SellerConfig {
String DELIVER2DEPOTTIPS4DEPOSITGOODS = "此商品买家选择寄存在UFO仓库，所以需要您将该商品发送至UFO南京鉴定中心";
String FORCENOTICE_ADDRESS_TITLE = "发货地址提醒";
interface DeliverDesc{
String SELLER_DEPOSIT_ORDER =
"1.36小时内需填写运单号，填写后24小时内需有物流信息信息，否则视为未发货或虚假发货；同时该笔寄售订单将被关闭，保证金将原路退还。累计3次未发货或者虚假发货，平台有权对卖家账号进行处理。\n" +
"2.仅支持顺丰寄付，并填写正确的运单号。如因填写错误或者虚假发货导致包裹丢失，平台不负责丢失包裹赔偿；不支持子母单发货，平台有权拒收所有商品。\n" +
"3.每件商品建议卖家绑定自有掉包扣，确保寄出商品与实际商品一致。\n" +
"4.球鞋类商品进行加固包装，若直接套袋邮寄将做拒收处理。若商品不符合平台验收标准，将被顺丰到付寄回。";
String COMMON = "1.请使用顺丰速运发货，平台有权拒收非顺丰速运及顺丰到货的快递，请慎重发货\n" +
"2.未按照《UFO卖家商品质检标准》发货，UFO有权取消订单并扣除保证金赔偿给买家";
}
}
... ...
... ... @@ -49,6 +49,10 @@ public class AppraiseAddressResp {
@Setter
private String tips;
@Getter
@Setter
private String deliverDesc;
public Integer getType() {
return type;
}
... ...
... ... @@ -100,10 +100,6 @@ public class SellerEnterTypeChangeEventHandler implements IEventHandler<SellerEn
//处理下个周期的数据
nextPeriodUpdate(sellerUid, entrySellerType, 0, configuration);
});
configurations.forEach(configuration -> {
});
}
private void nextPeriodUpdate(int sellerUid, EntrySellerType entrySellerType, Integer quantity, SellerOrderStatsConfiguration configuration) {
... ...
... ... @@ -775,7 +775,7 @@ public class ExpressInfoServiceImpl implements IExpressInfoService {
/**
* 根据状态获取物流类型
* @param status
* @param appraiseOrder
* @return
*/
private List<Integer> getAppraiseExpressType(AppraiseOrder appraiseOrder) {
... ... @@ -1347,12 +1347,15 @@ public class ExpressInfoServiceImpl implements IExpressInfoService {
throwServiceException(400, "订单类型错误");
}
resp = appraiseAddressService.findByDepotType(depotType.getCode());
resp.setDeliverDesc(SellerConfig.DeliverDesc.SELLER_DEPOSIT_ORDER);
return resp;
}
if (isHKLargeSettlementSuper(uid)) {
return appraiseAddressService.queryHKAppraiseAddress();
resp = appraiseAddressService.queryHKAppraiseAddress();
resp.setDeliverDesc(SellerConfig.DeliverDesc.COMMON);
return resp;
}
... ... @@ -1360,7 +1363,9 @@ public class ExpressInfoServiceImpl implements IExpressInfoService {
boolean orderCodeIsNull = (null == orderCode);
if (skupIsNull && orderCodeIsNull) {
LOGGER.warn("queryAppraiseAddress can not save back, all key info are null, uid {}", uid);
return appraiseAddressService.queryInitAddress();
resp = appraiseAddressService.queryInitAddress();
resp.setDeliverDesc(SellerConfig.DeliverDesc.COMMON);
return resp;
}
//寄存订单
... ... @@ -1368,12 +1373,13 @@ public class ExpressInfoServiceImpl implements IExpressInfoService {
//防止较早版本出错
if (Objects.nonNull(buyerOrder)) {
if (OrderAttributes.DEPOSITE.getCode() == buyerOrder.getAttributes()) {
return appraiseAddressService.findByDepotType(DepotType.NJ.getCode());
resp = appraiseAddressService.findByDepotType(DepotType.NJ.getCode());
resp.setDeliverDesc(SellerConfig.DeliverDesc.COMMON);
return resp;
}
}
AddressInfo buyerAddress = findSellerAddressInfo(uid, skup);
LOGGER.info("in queryAppraiseAddress get Address {} orderCode {}, skup {}", buyerAddress, orderCode, skup);
// 根据用户id查询默认地址的省份
... ... @@ -1382,7 +1388,9 @@ public class ExpressInfoServiceImpl implements IExpressInfoService {
resp = appraiseAddressService.queryAddressByAreaCode(buyerAddress.getAreaCode());
}
// 匹配不了，给个娄底的
return resp == null ? appraiseAddressService.queryInitAddress() : resp;
resp = resp == null ? appraiseAddressService.queryInitAddress() : resp;
resp.setDeliverDesc(SellerConfig.DeliverDesc.COMMON);
return resp;
}
/**
... ...
... ... @@ -10,10 +10,7 @@ import com.yohobuy.ufo.model.order.constants.DepotType;
import com.yohobuy.ufo.model.order.constants.SkupType;
import com.yohobuy.ufo.model.order.req.SellerDepositOrderDetailReq;
import com.yohobuy.ufo.model.order.req.SellerDepositOrderPrdListReq;
import com.yohobuy.ufo.model.order.resp.AppraiseAddressInfo;
import com.yohobuy.ufo.model.order.resp.OrderDetailInfo;
import com.yohobuy.ufo.model.order.resp.PageResp;
import com.yohobuy.ufo.model.order.resp.SellerDepositOrderDetailResp;
import com.yohobuy.ufo.model.order.resp.*;
import com.yohobuy.ufo.model.order.vo.AddressInfo;
import com.yohobuy.ufo.model.order.vo.ProductVo;
import com.yohoufo.common.utils.BigDecimalHelper;
... ... @@ -33,6 +30,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Objects;
@Service
public class SellerDepositOrderDetailService extends AbsOrderViewService {
... ... @@ -96,14 +94,15 @@ public class SellerDepositOrderDetailService extends AbsOrderViewService {
//
TimeoutBo timeout = calTimeout(TabType.BUY, uid, orderCode, pao.getStatus(),
pao.getCreateTime(), oa);
boolean expressShow = showEXpressInfoStatusList.contains(pao.getStatus());
ExpressInfoDetail lastExpressInfoDetail = expressInfoService.getLastExpressInfoDetail(pao);
//
AppraiseOrderStatus aos = AppraiseOrderStatus.getByCode(pao.getStatus());
OrderDetailInfo.StatusDetail statusDetail = OrderDetailInfo.StatusDetail
.builder()
.statuStr(aos.statusStr(oa))
.detailDesc(aos.detailDesc(oa))
.expressShow(expressShow)
.expressShow(Objects.isNull(lastExpressInfoDetail) ? false : true)
.build();
//
AppraiseAddressInfo appraiseAddressInfo = null;
... ... @@ -137,7 +136,7 @@ public class SellerDepositOrderDetailService extends AbsOrderViewService {
.appraiseAddress(appraiseAddressInfo)
.addressUpgradable(addressUpgradable)
.buttons(aos.detailButtons(oa))
.lastExpressInfoDetail(expressInfoService.getLastExpressInfoDetail(pao))
.lastExpressInfoDetail(lastExpressInfoDetail)
.appraiseProgress(orderStatisticInfo)
.build()
;
... ...