Merge branches 'feature/20210817_拼单报错修改_wuping' and 'master' of…

Merge branches 'feature/20210817_拼单报错修改_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/service/impl/CollageOrderBaseServiceImpl.java

@@ -72,8 +72,11 @@ public class CollageOrderBaseServiceImpl implements CollageOrderBaseService {
             // 2、createCollageUserId不存在，则只从当前商户拼单参与人信息列表中查询并返回，若商户级别拼单不存在，则提示拼单不存在
             else {
                 String collagePartnerMemberHashKey = this.genCollagePartnerMemberHashKey(collageOrderDto.getPartnerId());
-                CollagePartnerMember collagePartnerMember = this.getCollagePartnerMember(collagePartnerMemberHashKey, collageOrderDto.getCurrentUserId());
-
+                CollagePartnerMember collagePartnerMember = null;
+                if(StringUtils.isNotEmpty(collageOrderDto.getCurrentUserId())){
+                    //java.lang.IllegalArgumentException: non null hash key required
+                    collagePartnerMember = this.getCollagePartnerMember(collagePartnerMemberHashKey, collageOrderDto.getCurrentUserId());
+                }
                 // 若商户拼单参与人列表信息不存在或已过期
                 if (null == collagePartnerMember || collagePartnerMember.getExpire() < System.currentTimeMillis()) {
                     if (null != collagePartnerMember) {