update：企微客户备注电话查询，绑定会员头像返回

fs-service/src/main/java/com/fs/erp/service/impl/DfOrderServiceImpl.java

@@ -862,7 +862,11 @@ public class DfOrderServiceImpl implements IErpOrderService {
                                 }
                                 //下单失败 返回未推送状态
                                 String orderNumber = bspOrderResponse.getOrderNumber();
-                                rollBackOrder(orderNumber, failMsg);
+                                try {
+                                    rollBackOrder(orderNumber, failMsg);
+                                } catch (Exception e) {
+                                    log.info("{}订单获取运单失败，订单状态回滚失败，失败原因：{}，失败信息为：{}", orderNumber,e.getMessage(),failMsg);
+                                }
                             } else {
                                 setExpress(bspOrderResponse);
                             }
@@ -911,7 +915,11 @@ public class DfOrderServiceImpl implements IErpOrderService {
                                 }
                                 //下单失败 返回未推送状态
                                 String orderNumber = bspOrderResponse.getOrderNumber();
-                                rollBackOrderScrm(orderNumber, failMsg);
+                                try {
+                                    rollBackOrderScrm(orderNumber, failMsg);
+                                } catch (Exception e) {
+                                    log.info("{}订单获取运单失败，订单状态回滚失败，失败原因：{}，失败信息为：{}", orderNumber,e.getMessage(),failMsg);
+                                }
                             } else {
                                 setExpressScrm(bspOrderResponse);
                             }
@@ -949,21 +957,24 @@ public class DfOrderServiceImpl implements IErpOrderService {
         df.setFailMsg(failMsg); //失败消息
         df.setUpdateTime(new Date());
         fsStoreOrderDfMapper.updateFsStoreOrderDf(df);
+        log.info("{}订单获取运单失败，失败信息为：{}", orderNumber,failMsg);
         //推送失败消息
     }
 
     private void rollBackOrderScrm(String orderNumber, String failMsg) {
         FsStoreOrderScrm fsStoreOrder = fsStoreOrderScrmMapper.selectFsStoreOrderByOrderCode(orderNumber);
-        FsStoreOrder tempOrder = new FsStoreOrder();
-        tempOrder.setOrderId(fsStoreOrder.getId());
+        FsStoreOrderScrm tempOrder = new FsStoreOrderScrm();
+        tempOrder.setId(fsStoreOrder.getId());
         tempOrder.setExtendOrderId("");
-        fsStoreOrderMapper.updateFsStoreOrder(tempOrder);
+        tempOrder.setDeliveryId("");
+        fsStoreOrderScrmMapper.updateFsStoreOrder(tempOrder);
         FsStoreOrderDf df = new FsStoreOrderDf();
         df.setOrderId(fsStoreOrder.getId());
         df.setStatus(OrderInfoEnum.STATUS_1.getValue()); //回到默认
         df.setFailMsg(failMsg); //失败消息
         df.setUpdateTime(new Date());
         fsStoreOrderDfMapper.updateFsStoreOrderDf(df);
+        log.info("{}订单获取运单失败，失败信息为：{}", orderNumber,failMsg);
         //推送失败消息
     }
 

fs-service/src/main/java/com/fs/his/mapper/FsUserMapper.java

@@ -210,7 +210,7 @@ public interface FsUserMapper
     List<FsUser> findUsersByIds(@Param("userIds") List<Long> userIds);
 
     @Select({"<script> " +
-            "select user_id, nick_name, phone FROM fs_user where is_del=0 "+
+            "select user_id, nick_name,avatar, phone FROM fs_user where is_del=0 "+
             "  <if test=\"nickName != null  and nickName != ''\"> and nick_name like concat( #{nickName}, '%')</if>\n" +
             "            <if test=\"phone != null  and phone != ''\"> and phone =#{phone}</if>\n" +
             "order by user_id desc"+

fs-service/src/main/java/com/fs/qw/mapper/QwExternalContactMapper.java

@@ -252,7 +252,10 @@ public interface QwExternalContactMapper extends BaseMapper<QwExternalContact> {
             "    )"+
             "</if> " +
 
-            "            <if test=\"remarkMobiles != null  and remarkMobiles != ''\"> and ec.remark_mobiles like concat( #{remarkMobiles}, '%')</if>\n" +
+//            "            <if test=\"remarkMobiles != null  and remarkMobiles != ''\"> and ec.remark_mobiles like concat( #{remarkMobiles}, '%')</if>\n" +
+            "<if test=\"remarkMobiles != null and remarkMobiles != ''\">\n" +
+            "    AND ec.search_mobile LIKE concat(#{remarkMobiles}, '%')\n" +
+            "</if>" +
             "            <if test=\"remark != null  and remark != ''\"> and ec.remark like concat('%', #{remark}, '%')</if>\n" +
             "            <if test=\"remarkCorpName != null  and remarkCorpName != ''\"> and ec.remark_corp_name like concat('%', #{remarkCorpName}, '%')</if>\n" +
             "            <if test=\"addWay != null \"> and ec.add_way = #{addWay}</if>\n" +

fs-service/src/main/java/com/fs/qw/vo/QwFsUserVO.java

@@ -8,6 +8,10 @@ public class QwFsUserVO {
 
     /** 用户id */
     private Long userId;
+
+    /** 用户昵称 */
+    private String avatar;
+
     /** 用户昵称 */
     @Excel(name = "用户昵称")
     private String nickName;