Merge remote-tracking branch 'origin/test6.9.10' into test6.9.10

@@ -586,15 +586,11 @@ public class AppraiseService {
                 return new ApiResponse();
                 return new ApiResponse();
             }
             }
 
 
-            AppraiseOrderStorage appraiseOrderStorage = appraiseOrderStorageMapper.selectByOrderCode(orderCode);
-            if (appraiseOrderStorage == null){
-                LOGGER.warn("appraise order storage not exist {}", orderCode);
-                return new ApiResponse();
-            }
-
             // 子订单对应商品 1:1
             // 子订单对应商品 1:1
             AppraiseOrderGoods oneAppraiseOrderGood = appraiseOrderGoods.get(0);
             AppraiseOrderGoods oneAppraiseOrderGood = appraiseOrderGoods.get(0);
-            inBoxFacade.sendInboxSmsWhenAppraiseFinished(uid, oneAppraiseOrderGood.getProductName(),appraiseOrderStorage.getSizeName(), oneAppraiseOrderGood.getProductCode(), wayBillCode);
+            inBoxFacade.sendInboxSmsWhenAppraiseFinished(uid, oneAppraiseOrderGood.getProductName(),
+                    oneAppraiseOrderGood.getProductCode(),
+                    wayBillCode);
         }
         }
 
 
         if (appraiseOrder.getAttributes() == AppraiseOrderAttributes.PAID_DEPOSIT.getCode()) {  // 鉴定寄存的订单，需要同步修改寄存表的状态
         if (appraiseOrder.getAttributes() == AppraiseOrderAttributes.PAID_DEPOSIT.getCode()) {  // 鉴定寄存的订单，需要同步修改寄存表的状态

@@ -336,30 +336,29 @@ public class InBoxFacade extends BaseNoticeFacade{
      * 鉴定结束发货，发送站内信和短信
      * 鉴定结束发货，发送站内信和短信
      * @param uid
      * @param uid
      * @param prdName
      * @param prdName
-     * @param sizeName
      * @param productCode
      * @param productCode
      * @param wayBillCode
      * @param wayBillCode
      */
      */
-    public void sendInboxSmsWhenAppraiseFinished(int uid, String prdName, String sizeName, String productCode,String wayBillCode){
+    public void sendInboxSmsWhenAppraiseFinished(int uid, String prdName, String productCode,String wayBillCode){
 
 
         try {
         try {
             executorService.execute(() -> {
             executorService.execute(() -> {
-                String params = buildParams(prdName, sizeName, productCode);
+                String params = buildParams(prdName, productCode);
                 InboxReqVO req = buildInboxReqVO(uid, params, InboxBusinessTypeEnum.INBOX_DELIVERY_APPRAISE_FINISHED);
                 InboxReqVO req = buildInboxReqVO(uid, params, InboxBusinessTypeEnum.INBOX_DELIVERY_APPRAISE_FINISHED);
 
 
                 InBoxResponse resp = inBoxSDK.addInbox(req);
                 InBoxResponse resp = inBoxSDK.addInbox(req);
-                log.info("record sendInboxSmsWhenAppraiseFinished inbox msg, uid {}, prdName {}, resp {}",uid, prdName, resp);
-
+                log.info("record sendInboxSmsWhenAppraiseFinished inbox msg, uid {}, prdName {}, wayBillCode {}, resp {}", uid, prdName, wayBillCode, resp);
 
 
                 //短信
                 //短信
                 String phone = userProxyService.getMobile(uid);
                 String phone = userProxyService.getMobile(uid);
                 if (StringUtils.isBlank(phone)){
                 if (StringUtils.isBlank(phone)){
-                    log.warn("sendInboxSmsComm sms send fail,sellerUid {}, prdName {} timelimitDesc {}",uid, prdName);
+                    log.warn("sendInboxSmsWhenAppraiseFinished sms send fail,sellerUid {}, prdName {} timelimitDesc {}",uid, prdName);
                     return;
                     return;
                 }
                 }
                 List<String> mobileList = Arrays.asList(phone);
                 List<String> mobileList = Arrays.asList(phone);
-                String content = getReplacedContent(InboxBusinessTypeEnum.SMS_DELIVERY_APPRAISE_FINISHED.getContent(),prdName,sizeName,productCode,wayBillCode);
+                String content = getReplacedContent(InboxBusinessTypeEnum.SMS_DELIVERY_APPRAISE_FINISHED.getContent(), prdName ,productCode,wayBillCode);
                 sendSmsService.smsSendByMobile(content, mobileList);
                 sendSmsService.smsSendByMobile(content, mobileList);
+                log.info("sendInboxSmsWhenAppraiseFinished sms content {}, mobileList {}", content, mobileList);
             });
             });
 
 
         } catch (Exception e) {
         } catch (Exception e) {