ufo / yohoufo-fore · Commits

Go to a project

Authored by chenchao
Commit dc3dbdde3bafbf41b126ce97e5b96180c90b3f97 1 parent 6bd3e9c7

add method=ufo.order.appraiseAddress 

deliverDesc
Inline Side-by-side
Showing 3 changed files with 29 additions and 6 deletions
@@ -12,4 +12,15 @@ public interface SellerConfig { @@ -12,4 +12,15 @@ public interface SellerConfig {
12 String DELIVER2DEPOTTIPS4DEPOSITGOODS = "此商品买家选择寄存在UFO仓库，所以需要您将该商品发送至UFO南京鉴定中心"; 12 String DELIVER2DEPOTTIPS4DEPOSITGOODS = "此商品买家选择寄存在UFO仓库，所以需要您将该商品发送至UFO南京鉴定中心";
13 13
14 String FORCENOTICE_ADDRESS_TITLE = "发货地址提醒"; 14 String FORCENOTICE_ADDRESS_TITLE = "发货地址提醒";
  15 +
  16 + interface DeliverDesc{
  17 + String SELLER_DEPOSIT_ORDER =
  18 + "1.36小时内需填写运单号，填写后24小时内需有物流信息信息，否则视为未发货或虚假发货；同时该笔寄售订单将被关闭，保证金将原路退还。累计3次未发货或者虚假发货，平台有权对卖家账号进行处理。\n" +
  19 + "2.仅支持顺丰寄付，并填写正确的运单号。如因填写错误或者虚假发货导致包裹丢失，平台不负责丢失包裹赔偿；不支持子母单发货，平台有权拒收所有商品。\n" +
  20 + "3.每件商品建议卖家绑定自有掉包扣，确保寄出商品与实际商品一致。\n" +
  21 + "4.球鞋类商品进行加固包装，若直接套袋邮寄将做拒收处理。若商品不符合平台验收标准，将被顺丰到付寄回。";
  22 + String COMMON = "1.请使用顺丰速运发货，平台有权拒收非顺丰速运及顺丰到货的快递，请慎重发货\n" +
  23 + "2.未按照《UFO卖家商品质检标准》发货，UFO有权取消订单并扣除保证金赔偿给买家";
  24 + }
  25 +
15 } 26 }
@@ -49,6 +49,10 @@ public class AppraiseAddressResp { @@ -49,6 +49,10 @@ public class AppraiseAddressResp {
49 @Setter 49 @Setter
50 private String tips; 50 private String tips;
51 51
  52 + @Getter
  53 + @Setter
  54 + private String deliverDesc;
  55 +
52 public Integer getType() { 56 public Integer getType() {
53 return type; 57 return type;
54 } 58 }
@@ -775,7 +775,7 @@ public class ExpressInfoServiceImpl implements IExpressInfoService { @@ -775,7 +775,7 @@ public class ExpressInfoServiceImpl implements IExpressInfoService {
775 775
776 /** 776 /**
777 * 根据状态获取物流类型 777 * 根据状态获取物流类型
778 - * @param status 778 + * @param appraiseOrder
779 * @return 779 * @return
780 */ 780 */
781 private List<Integer> getAppraiseExpressType(AppraiseOrder appraiseOrder) { 781 private List<Integer> getAppraiseExpressType(AppraiseOrder appraiseOrder) {
@@ -1346,12 +1346,15 @@ public class ExpressInfoServiceImpl implements IExpressInfoService { @@ -1346,12 +1346,15 @@ public class ExpressInfoServiceImpl implements IExpressInfoService {
1346 throwServiceException(400, "订单类型错误"); 1346 throwServiceException(400, "订单类型错误");
1347 } 1347 }
1348 resp = appraiseAddressService.findByDepotType(depotType.getCode()); 1348 resp = appraiseAddressService.findByDepotType(depotType.getCode());
  1349 + resp.setDeliverDesc(SellerConfig.DeliverDesc.SELLER_DEPOSIT_ORDER);
1349 return resp; 1350 return resp;
1350 } 1351 }
1351 1352
1352 1353
1353 if (isHKLargeSettlementSuper(uid)) { 1354 if (isHKLargeSettlementSuper(uid)) {
1354 - return appraiseAddressService.queryHKAppraiseAddress(); 1355 + resp = appraiseAddressService.queryHKAppraiseAddress();
  1356 + resp.setDeliverDesc(SellerConfig.DeliverDesc.COMMON);
  1357 + return resp;
1355 } 1358 }
1356 1359
1357 1360
@@ -1359,7 +1362,9 @@ public class ExpressInfoServiceImpl implements IExpressInfoService { @@ -1359,7 +1362,9 @@ public class ExpressInfoServiceImpl implements IExpressInfoService {
1359 boolean orderCodeIsNull = (null == orderCode); 1362 boolean orderCodeIsNull = (null == orderCode);
1360 if (skupIsNull && orderCodeIsNull) { 1363 if (skupIsNull && orderCodeIsNull) {
1361 LOGGER.warn("queryAppraiseAddress can not save back, all key info are null, uid {}", uid); 1364 LOGGER.warn("queryAppraiseAddress can not save back, all key info are null, uid {}", uid);
1362 - return appraiseAddressService.queryInitAddress(); 1365 + resp = appraiseAddressService.queryInitAddress();
  1366 + resp.setDeliverDesc(SellerConfig.DeliverDesc.COMMON);
  1367 + return resp;
1363 } 1368 }
1364 1369
1365 //寄存订单 1370 //寄存订单
@@ -1367,12 +1372,13 @@ public class ExpressInfoServiceImpl implements IExpressInfoService { @@ -1367,12 +1372,13 @@ public class ExpressInfoServiceImpl implements IExpressInfoService {
1367 //防止较早版本出错 1372 //防止较早版本出错
1368 if (Objects.nonNull(buyerOrder)) { 1373 if (Objects.nonNull(buyerOrder)) {
1369 if (OrderAttributes.DEPOSITE.getCode() == buyerOrder.getAttributes()) { 1374 if (OrderAttributes.DEPOSITE.getCode() == buyerOrder.getAttributes()) {
1370 - return appraiseAddressService.findByDepotType(DepotType.NJ.getCode()); 1375 + resp = appraiseAddressService.findByDepotType(DepotType.NJ.getCode());
  1376 + resp.setDeliverDesc(SellerConfig.DeliverDesc.COMMON);
  1377 + return resp;
1371 } 1378 }
1372 } 1379 }
1373 1380
1374 AddressInfo buyerAddress = findSellerAddressInfo(uid, skup); 1381 AddressInfo buyerAddress = findSellerAddressInfo(uid, skup);
1375 -  
1376 LOGGER.info("in queryAppraiseAddress get Address {} orderCode {}, skup {}", buyerAddress, orderCode, skup); 1382 LOGGER.info("in queryAppraiseAddress get Address {} orderCode {}, skup {}", buyerAddress, orderCode, skup);
1377 1383
1378 // 根据用户id查询默认地址的省份 1384 // 根据用户id查询默认地址的省份
@@ -1381,7 +1387,9 @@ public class ExpressInfoServiceImpl implements IExpressInfoService { @@ -1381,7 +1387,9 @@ public class ExpressInfoServiceImpl implements IExpressInfoService {
1381 resp = appraiseAddressService.queryAddressByAreaCode(buyerAddress.getAreaCode()); 1387 resp = appraiseAddressService.queryAddressByAreaCode(buyerAddress.getAreaCode());
1382 } 1388 }
1383 // 匹配不了，给个娄底的 1389 // 匹配不了，给个娄底的
1384 - return resp == null ? appraiseAddressService.queryInitAddress() : resp; 1390 + resp = resp == null ? appraiseAddressService.queryInitAddress() : resp;
  1391 + resp.setDeliverDesc(SellerConfig.DeliverDesc.COMMON);
  1392 + return resp;
1385 } 1393 }
1386 1394
1387 /** 1395 /**