Merge remote-tracking branch 'origin/developerA' into developerA

src/main/java/com/caimei365/order/model/vo/OrderVo.java

@@ -34,6 +34,10 @@ public class OrderVo implements Serializable {
      * 机构Id
      */
     private Integer clubId;
+    /**
+     * 用户身份:1协销 2会员机构 3供应商 4普通机构
+     */
+    private Integer userIdentity;
     /**
      * 机构名称（协销订单列表用）
      */

src/main/java/com/caimei365/order/service/impl/OrderSellerServiceImpl.java

@@ -71,6 +71,8 @@ public class OrderSellerServiceImpl implements OrderSellerService {
         // 设置机构类型
         Integer svipUserId = baseMapper.getSvipUserIdByClubId(order.getClubId());
         order.setSvipUserFlag(null != svipUserId ? 1 : 0);
+        Integer userIdentity = baseMapper.getIdentityByUserId(order.getUserId());
+        order.setUserIdentity(userIdentity);
     }
 
     /**