Merge branch 'test6.9.8' into gray

@@ -5,7 +5,6 @@ import com.yoho.error.exception.ServiceException;
 import com.yohobuy.ufo.model.order.common.TabType;
 import com.yohobuy.ufo.model.order.resp.ExpressInfoRespBo;
 import com.yohoufo.common.ApiResponse;
-import com.yohoufo.common.cache.Cachable;
 import com.yohoufo.order.model.response.AppraiseAddressResp;
 import com.yohoufo.order.service.IExpressInfoService;
 import org.apache.commons.lang3.StringUtils;

@@ -171,7 +171,7 @@ public class SellerDownShelfTaskHandler extends AbstractSellerTaskHandler<SkupDo
     private void inboxNotify(int uid, Map<Integer, SkupDto> skupDtoMap) {
         try {
             SellerOrderGoods psog = skupDtoMap.values().iterator().next().getSellerOrderGoods();
-            inBoxFacade.sellerPlaySelf(uid, psog);
+            inBoxFacade.sellerPlaySelf(uid, psog, true);
         } catch (Exception ex) {
             log.error("[{}-{}] exception happened when inboxNotify", uid, ex);
         }

@@ -322,7 +322,7 @@ public class DepositServiceImpl implements DepositService {
 
         clearCache(uid, sd.getProductId(), sd.getStorageId());
         SellerOrderGoods psog = sellerOrderGoodsMapper.selectByPrimaryKey(sd.getNewSkup());
-        inBoxFacade.sellerPlaySelf(uid, psog);
+        inBoxFacade.sellerPlaySelf(uid, psog, false);
     }
 
     /**

@@ -443,7 +443,7 @@ public class SellerOrderService implements IOrderListService, IOrderDetailServic
                 }
                 SkupDto skupDto = tskupMap.values().iterator().next();
                 SellerOrderGoods sellerOrderGoods = skupDto.getSellerOrderGoods();
-                inBoxFacade.sellerPlaySelf(sellerOrderGoods.getUid(), sellerOrderGoods);
+                inBoxFacade.sellerPlaySelf(sellerOrderGoods.getUid(), sellerOrderGoods, true);
                 //clean cache
                 cacheCleaner.delete(Arrays.asList(CacheKeyBuilder.orderListKey(req.getUid(), TabType.SELL.getValue()),
                         CacheKeyBuilder.sellerOrderDetailKey(sellerOrderGoods)

@@ -80,7 +80,7 @@ public class InBoxFacade extends BaseNoticeFacade{
      *
      * @param sellerUid
      */
-    public void sellerPlaySelf(int sellerUid,SellerOrderGoods sellerOrderGoods) {
+    public void sellerPlaySelf(int sellerUid,SellerOrderGoods sellerOrderGoods, boolean earnMoneyRequired) {
         try {
             executorService.execute(() -> {
                 String goodsTypeTag = buildGoodsTypeTagForSeller(sellerOrderGoods);
@@ -88,9 +88,12 @@ public class InBoxFacade extends BaseNoticeFacade{
                 String sizeName = sellerOrderGoods.getSizeName();
                 Product product = productMapper.selectByPrimaryKey(sellerOrderGoods.getProductId());
                 String productCode = product.getProductCode();
-
+                String earnMoneyContent = "。";
+                if (earnMoneyRequired){
+                    earnMoneyContent = "，保证金将于1个工作日内退回您的账户。";
+                }
                 InboxBusinessTypeEnum ibt = InboxBusinessTypeEnum.SALE_UNSHELF;
-                String params = buildParams(goodsTypeTag,prdName,sizeName,productCode);
+                String params = buildParams(goodsTypeTag,prdName,sizeName,productCode, earnMoneyContent);
                 InboxReqVO req = buildInboxReqVO(sellerUid, params, ibt);
 
                 InBoxResponse resp = inBoxSDK.addInbox(req);

@@ -474,7 +474,7 @@ public class SellerOrderCancelService {
             }
             //async execute msg
 
-            inBoxFacade.sellerPlaySelf(sellerUid, psog);
+            inBoxFacade.sellerPlaySelf(sellerUid, psog, true);
         }
 
         return result;
@@ -634,7 +634,7 @@ public class SellerOrderCancelService {
                     else {
                         try {
                             refundEarnestMoney(sellerOrder, targetSOStatus, penaltyResult.getLeftAmount());
-                            inBoxFacade.sellerPlaySelf(sellerUid, psog);
+                            inBoxFacade.sellerPlaySelf(sellerUid, psog, true);
                         } catch (Exception e) {
                             logger.warn("返回剩余保证金失败, sellerUid is {}, skup is {}, err is {}", sellerUid, skup, e.getMessage());
                         }