升级入驻卖家PLUS

@@ -23,4 +23,6 @@ public interface StoredSellerMapper {
     List<Integer> selectUidByCertNameAndUid(@Param("merchantName") String merchantName, @Param("uid") String uid);
     
     int updateOperateInfo(@Param("operatorUid") Integer operatorUid, @Param("operatorName") String operatorName, @Param("uid") Integer uid);
+
+    List<StoredSeller> selectByUids(@Param("uids") List<Integer> uids);
 }

@@ -23,7 +23,7 @@ public class StoredSeller {
     //操作员uid
     private Integer operatorUid;
 
-    private Integer operatorName;
+    private String operatorName;
 
     //入驻时间
     private long enterTime;

@@ -83,4 +83,13 @@
       where uid = #{uid}
   </update>
   
+  <select id="selectByUids" resultMap="BaseResultMap">
+    select <include refid="Base_Column_List" /> 
+    from stored_seller 
+    where uid in
+    <foreach collection="uids" item="uid" open="(" separator="," close=")">
+      #{uid}
+    </foreach>
+  </select>
+  
 </mapper>
\ No newline at end of file

@@ -54,5 +54,11 @@ public class StoredSellerRespVo {
 
     //身份证背面照片url
     private String idCardBackUrl;
+    
+    //操作人
+    private String operatorName;
+    
+    //更新时间
+    private String updateTime;
 
 }

@@ -36,6 +36,7 @@ import com.yoho.order.dal.ZhimaCertMapper;
 import com.yoho.order.model.InvestUserBO;
 import com.yoho.order.model.SellerReqBO;
 import com.yoho.order.model.SellerWallet;
+import com.yoho.order.model.StoredSeller;
 import com.yoho.order.model.StoredSellerReqVo;
 import com.yoho.order.model.TradeBills;
 import com.yoho.order.model.TradeBillsReq;
@@ -154,6 +155,10 @@ public class TradeBillsServiceImpl implements ITradeBillsService {
         List<StoredSellerRespVo> respList = Lists.newArrayList();
         List<SellerWallet> sws = sellerWalletMapper.selectByUidAndMerchantUids(null, CollectionUtil.distinct(ls, ZhimaCert::getUid), 0, ls.size());
         Map<Integer, SellerWallet> swsMap = CollectionUtil.extractMap(sws, SellerWallet::getUid);
+        List<Integer> uidList = ls.stream().map(ZhimaCert::getUid).collect(Collectors.toList());
+        List<StoredSeller> storedSellerList = storedSellerMapper.selectByUids(uidList);
+        Map<Integer, StoredSeller> storedSellerMap = CollectionUtil.extractMap(storedSellerList, StoredSeller::getUid);
+        
         for (ZhimaCert item : ls) {
             StoredSellerRespVo resp = new StoredSellerRespVo();
             resp.setUid(item.getUid());
@@ -180,6 +185,10 @@ public class TradeBillsServiceImpl implements ITradeBillsService {
 
             //招商人
             resp.setInvestName(item.getInvestName());
+            
+            //升级入驻卖家PLUS操作信息
+            resp.setOperatorName(null == storedSellerMap.get(item.getUid()).getOperatorName() ? "-" : storedSellerMap.get(item.getUid()).getOperatorName());
+            resp.setUpdateTime(null == storedSellerMap.get(item.getUid()).getOperatorName() ? "-" : DateUtil.long2DateStr(storedSellerMap.get(item.getUid()).getUpdateTime()*1000, "yyyy-MM-dd"));
             respList.add(resp);
         }
         return respList;