new force notice appraise address

@@ -8,4 +8,6 @@ public interface SellerConfig {
     int ENTER_TYPE_DEFAULT_LEVEL = 0;
 
     String ENTER_TYPE_DEFAULT_FUNCS="[]";
+
+    String DELIVER2DEPOTTIPS4DEPOSITGOODS = "此商品买家选择寄存在UFO仓库，所以需要您将该商品发送至UFO南京鉴定中心";
 }

@@ -92,11 +92,11 @@ public class ExpressInfoController {
      * @return
      */
     @RequestMapping(params = "method=ufo.order.noticeAppraiseAddressChanged")
-    public ApiResponse noticeAppraiseAddressChanged(@RequestParam("uid") Integer uid,
+    public ApiResponse forceNoticeAppraiseAddress(@RequestParam("uid") Integer uid,
                                             @RequestParam(value="orderCode")Long orderCode) {
         LOG.info("method=ufo.order.noticeAppraiseAddressChanged in, uid  {}, orderCode {}", uid, orderCode);
 
-        AppraiseAddressResp appraiseAddressResp = null;//expressInfoService.noticeAppraiseAddressChanged(uid, orderCode);
+        AppraiseAddressResp appraiseAddressResp = expressInfoService.forceNoticeAppraiseAddress(uid, orderCode);
         return new ApiResponse.ApiResponseBuilder().code(200).data(appraiseAddressResp).build();
     }
 }

@@ -36,6 +36,15 @@ public class AppraiseAddressResp {
     @JSONField(name="isChanged")
     private boolean isChanged;
 
+    @Getter
+    @Setter
+    @JSONField(name="isForceShow")
+    private boolean isForceShow;
+
+    @Getter
+    @Setter
+    private String tips;
+
     public Integer getType() {
 		return type;
 	}

@@ -97,7 +97,7 @@ public interface IExpressInfoService {
     AppraiseAddressResp queryAppraiseAddress(Integer uid, Long orderCode, Integer skup);
 
 
-    AppraiseAddressResp noticeAppraiseAddressChanged(Integer uid, Long orderCode);
+    AppraiseAddressResp forceNoticeAppraiseAddress(Integer uid, Long orderCode);
 
 
 

@@ -27,6 +27,7 @@ import com.yohoufo.dal.order.*;
 import com.yohoufo.dal.order.model.*;
 import com.yohoufo.order.common.ExpressForMqSend;
 import com.yohoufo.order.constants.MetaKey;
+import com.yohoufo.order.constants.SellerConfig;
 import com.yohoufo.order.event.BuyerOrderSellerDeliveryCheckEvent;
 import com.yohoufo.order.event.ErpBuyerOrderEvent;
 import com.yohoufo.order.model.OperateTransferExpressInfo;
@@ -1127,12 +1128,34 @@ public class ExpressInfoServiceImpl implements IExpressInfoService {
      * @return
      */
     @Override
-    public AppraiseAddressResp noticeAppraiseAddressChanged(Integer uid, Long orderCode) {
+    public AppraiseAddressResp forceNoticeAppraiseAddress(Integer uid, Long orderCode) {
 
         if (null == uid || orderCode == null) {
-            LOGGER.warn("in noticeAppraiseAddressChanged check in-param fail, uid {}, orderCode {}", uid, orderCode);
+            LOGGER.warn("in forceNoticeAppraiseAddress check in-param fail, uid {}, orderCode {}", uid, orderCode);
             throw new ServiceException(ServiceError.ORDER_REQUEST_PARM_IS_EMPTY);
         }
+        AppraiseAddressResp resp = null;
+        BuyerOrder buyerOrder = buyerOrderMapper.selectOnlyByOrderCode(orderCode);
+        if (Objects.isNull(buyerOrder)){
+            LOGGER.warn("in forceNoticeAppraiseAddress buyerOrder not exist,uid {}, orderCode {}", uid, orderCode);
+            return resp;
+        }
+        if(BuyerOrderUtils.isDeposit(buyerOrder)){
+            resp = getAppraiseAddressResp4Deposit(uid, orderCode);
+        }
+        return resp;
+    }
+
+    private AppraiseAddressResp getAppraiseAddressResp4Deposit(Integer uid, Long orderCode){
+        LOGGER.info("in getAppraiseAddressResp4Deposit uid {}, orderCode {}", uid, orderCode);
+        AppraiseAddressResp resp =  appraiseAddressService.findByDepotType(DepotType.NJ.getCode());
+        final String tips = SellerConfig.DELIVER2DEPOTTIPS4DEPOSITGOODS;
+        resp.setForceShow(true);
+        resp.setTips(tips);
+        return resp;
+    }
+
+    private AppraiseAddressResp getAppraiseAddressResp4AddrressChange(int uid, long orderCode){
         BuyerOrderGoods pbog = buyerOrderGoodsMapper.selectOnlyByOrderCode(orderCode);
         if (Objects.isNull(pbog)){
             LOGGER.warn("in noticeAppraiseAddressChanged BuyerOrderGoods not exist, uid {}, order code {}", uid, orderCode);