Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop

framework/src/main/java/cn/lili/modules/im/serviceimpl/ImTalkServiceImpl.java

@@ -77,12 +77,13 @@ public class ImTalkServiceImpl extends ServiceImpl<ImTalkMapper, ImTalk> impleme
                 Member self = memberService.getById(selfId);
                 Member otherMember = memberService.getById(userId);
                 Store otherStore = storeService.getById(userId);
-                    if(otherStore != null){
-                        imTalk = new ImTalk(self, otherStore);
-                    }else if (otherMember != null){
-                        imTalk = new ImTalk(self, otherMember);
-                    }
+                if(otherStore != null){
+                    imTalk = new ImTalk(self, otherStore);
+                }else if (otherMember != null){
+                    imTalk = new ImTalk(self, otherMember);
+                }
             }
+            this.save(imTalk);
         }
         return imTalk;
     }

framework/src/main/java/cn/lili/modules/order/cart/render/impl/SkuFreightRender.java

@@ -71,7 +71,7 @@ public class SkuFreightRender implements CartRenderStep {
                             && !freightTemplate.getFreightTemplateChildList().isEmpty()) {
                         //店铺模版免运费则跳过
                         if (freightTemplate.getPricingMethod().equals(FreightTemplateEnum.FREE.name())) {
-                            break;
+                            continue;
                         }
 
                         //运费模版