submit

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/WxLoginService.java

@@ -1011,14 +1011,24 @@ public class WxLoginService implements IWxLoginService {
 
         if(goodsVo.getGoodsType()==2){
             pageUrl = "pages2/bank/detail";
-            sceneParam.append("id=").append(goodsVo.getGoodsId()).append("&");
-            sceneParam.append("sc=").append(bo.getShareCode());
+            sceneParam.append("id=").append(goodsVo.getGoodsId());
+            if (ObjectUtils.isNotNull(bo.getShareCode())){
+                sceneParam.append("&").append("sc=").append(bo.getShareCode());
+            }
+            if (StringUtils.isNotBlank(bo.getShareActivityCode())){
+                sceneParam.append("&").append("sac=").append(bo.getShareActivityCode());
+            }
         }
         if(goodsVo.getGoodsType()==1||goodsVo.getGoodsType()==6){
             pageUrl = "pages3/course/detail";
             sceneParam.append("id=").append(goodsVo.getGoodsId()).append("&");
-            sceneParam.append("goodsType=").append(goodsVo.getGoodsType()).append("&");
-            sceneParam.append("sc=").append(bo.getShareCode());
+            sceneParam.append("gt=").append(goodsVo.getGoodsType());
+            if (ObjectUtils.isNotNull(bo.getShareCode())){
+                sceneParam.append("&").append("sc=").append(bo.getShareCode());
+            }
+            if (StringUtils.isNotBlank(bo.getShareActivityCode())){
+                sceneParam.append("&").append("sac=").append(bo.getShareActivityCode());
+            }
         }
         obj.put("page", pageUrl);
         obj.put("scene",sceneParam.toString());

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/service/impl/GoodsServiceImpl.java

@@ -931,7 +931,7 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
             }
         });
 
-        return null;
+        return voList;
     }
 
     /**

zhongzheng-system/src/main/java/com/zhongzheng/modules/wx/bo/WxShareGoodsBo.java

@@ -18,4 +18,7 @@ public class WxShareGoodsBo {
 
     @ApiModelProperty("分享码")
     private String shareCode;
+
+    @ApiModelProperty("活动分享码")
+    private String shareActivityCode;
 }