fix

zhongzheng-api/src/main/java/com/zhongzheng/controller/cmmon/CommonController.java

@@ -11,6 +11,7 @@ import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.common.utils.ServletUtils;
 import com.zhongzheng.common.utils.ToolsUtils;
 import com.zhongzheng.framework.web.service.WxLoginService;
+import com.zhongzheng.modules.activity.vo.ActivityGoodsPriceVo;
 import com.zhongzheng.modules.base.bo.ConfigQueryBo;
 import com.zhongzheng.modules.course.bo.CourseQueryBo;
 import com.zhongzheng.modules.course.bo.CourseTopicGoodsQueryBo;
@@ -21,6 +22,8 @@ import com.zhongzheng.modules.course.vo.CourseTopicVo;
 import com.zhongzheng.modules.course.vo.CourseUserVo;
 import com.zhongzheng.modules.data.domain.DataWxTpClick;
 import com.zhongzheng.modules.data.service.IDataWxTpClickService;
+import com.zhongzheng.modules.distribution.bo.DistributionActivityGoodsQueryBo;
+import com.zhongzheng.modules.distribution.service.IDistributionActivityGoodsService;
 import com.zhongzheng.modules.distribution.service.IDistributionSellerService;
 import com.zhongzheng.modules.distribution.vo.DistributionSellerVo;
 import com.zhongzheng.modules.goods.service.IGoodsSpecTemplateService;
@@ -77,6 +80,8 @@ public class CommonController extends BaseController {
 
     private final IDataWxTpClickService iDataWxTpClickService;
 
+    private final IDistributionActivityGoodsService iDistributionActivityGoodsService;
+
     /**
      * 获取微信小程序信息（网页跳转小程序）
      */
@@ -311,11 +316,6 @@ public class CommonController extends BaseController {
         return toAjax(iDataWxTpClickService.save(dataWxTpClick)? 1 : 0);
     }
 
-    /**
-     * 获取用户信息
-     *
-     * @return 用户信息
-     */
     @ApiOperation("通过分享code查询业务员用户信息")
     @GetMapping("/distribution/getInfoByShareCode")
     public AjaxResult<DistributionSellerVo> getInfoByShareCode(String shareCode)
@@ -328,4 +328,13 @@ public class CommonController extends BaseController {
         return AjaxResult.success(vo);
     }
 
+
+    @ApiOperation("获取分销活动商品列表")
+    @GetMapping("/distribution/getGoodsList")
+    public TableDataInfo<ActivityGoodsPriceVo> distributionGoodsList(DistributionActivityGoodsQueryBo bo)
+    {
+        startPage();
+        List<ActivityGoodsPriceVo> list = iDistributionActivityGoodsService.getGoodsList(bo);
+        return getDataTable(list);
+    }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/vo/ActivityGoodsPriceVo.java

@@ -0,0 +1,56 @@
+package com.zhongzheng.modules.activity.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.math.BigDecimal;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 活动商品价格视图对象 mall_package
+ *
+ * @author ruoyi
+ * @date 2023-03-24
+ */
+@Data
+@ApiModel("活动商品价格视图对象")
+public class ActivityGoodsPriceVo {
+	private static final long serialVersionUID = 1L;
+
+	/** 主键 */
+	@ApiModelProperty("主键")
+	private Long id;
+
+	/** 商品ID */
+	@Excel(name = "商品ID")
+	@ApiModelProperty("商品ID")
+	private Long goodsId;
+	/** 活动价格 */
+	@Excel(name = "活动价格")
+	@ApiModelProperty("活动价格")
+	private BigDecimal goodsPrice;
+	/** 活动编码 */
+	@Excel(name = "活动编码")
+	@ApiModelProperty("活动编码")
+	private String activityCode;
+	/** 活动类型 */
+	@Excel(name = "活动类型")
+	@ApiModelProperty("活动类型")
+	private Integer type;
+	/** 状态：1有效，-1无效 */
+	@Excel(name = "状态：1有效，-1无效")
+	@ApiModelProperty("状态：1有效，-1无效")
+	private Integer status;
+	/** 商品名称 */
+	@Excel(name = "商品名称")
+	@ApiModelProperty("商品名称")
+	private String goodsName;
+	/** 封面地址 */
+	@Excel(name = "封面地址")
+	@ApiModelProperty("封面地址")
+	private String coverUrl;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionSellerAddBo.java

@@ -71,4 +71,7 @@ public class DistributionSellerAddBo {
     /** 已提现余额 */
     @ApiModelProperty("已提现余额")
     private BigDecimal usedCash;
+    /** 冻结金额 */
+    @ApiModelProperty("冻结金额")
+    private BigDecimal freezeCash;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/domain/DistributionSeller.java

@@ -63,4 +63,6 @@ private static final long serialVersionUID=1L;
     private BigDecimal cash;
     /** 已提现余额 */
     private BigDecimal usedCash;
+    /** 冻结金额 */
+    private BigDecimal freezeCash;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/mapper/DistributionActivityGoodsMapper.java

@@ -1,8 +1,12 @@
 package com.zhongzheng.modules.distribution.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.activity.vo.ActivityGoodsPriceVo;
+import com.zhongzheng.modules.distribution.bo.DistributionActivityGoodsQueryBo;
 import com.zhongzheng.modules.distribution.domain.DistributionActivityGoods;
 
+import java.util.List;
+
 /**
  * 【请填写功能名称】Mapper接口
  *
@@ -10,5 +14,5 @@ import com.zhongzheng.modules.distribution.domain.DistributionActivityGoods;
  * @date 2023-03-06
  */
 public interface DistributionActivityGoodsMapper extends BaseMapper<DistributionActivityGoods> {
-
+   List<ActivityGoodsPriceVo> getGoodsList(DistributionActivityGoodsQueryBo bo);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/service/IDistributionActivityGoodsService.java

@@ -1,6 +1,8 @@
 package com.zhongzheng.modules.distribution.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.activity.vo.ActivityGoodsPriceVo;
+import com.zhongzheng.modules.distribution.bo.DistributionActivityGoodsQueryBo;
 import com.zhongzheng.modules.distribution.domain.DistributionActivityGoods;
 import com.zhongzheng.modules.goods.bo.GoodsPullTenantBo;
 
@@ -18,4 +20,6 @@ public interface IDistributionActivityGoodsService extends IService<Distribution
 
     void saveBatchEntity(List<DistributionActivityGoods> activityGoodsList);
 
+    List<ActivityGoodsPriceVo> getGoodsList(DistributionActivityGoodsQueryBo bo);
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/service/impl/DistributionActivityGoodsServiceImpl.java

@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zhongzheng.common.core.redis.RedisCache;
 import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.activity.vo.ActivityGoodsPriceVo;
 import com.zhongzheng.modules.bank.domain.*;
 import com.zhongzheng.modules.bank.service.*;
 import com.zhongzheng.modules.base.domain.Certificate;
@@ -19,6 +20,7 @@ import com.zhongzheng.modules.base.domain.CertificateTp;
 import com.zhongzheng.modules.base.service.*;
 import com.zhongzheng.modules.course.domain.*;
 import com.zhongzheng.modules.course.service.*;
+import com.zhongzheng.modules.distribution.bo.DistributionActivityGoodsQueryBo;
 import com.zhongzheng.modules.distribution.domain.DistributionActivityGoods;
 import com.zhongzheng.modules.distribution.mapper.DistributionActivityGoodsMapper;
 import com.zhongzheng.modules.distribution.service.IDistributionActivityGoodsService;
@@ -594,6 +596,11 @@ public class DistributionActivityGoodsServiceImpl extends ServiceImpl<Distributi
         saveBatch(activityGoodsList);
     }
 
+    @Override
+    public List<ActivityGoodsPriceVo> getGoodsList(DistributionActivityGoodsQueryBo bo) {
+        return this.baseMapper.getGoodsList(bo);
+    }
+
     private void disposeGoodsCourseTeacher(Long oldGoodsId, Long newGoodsId, Long newTenantId) {
         //双师关联
         goodsCourseTeacherService.deleteByIdTeanant(newGoodsId,newTenantId);

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/service/impl/DistributionActivityPosterServiceImpl.java

@@ -113,7 +113,7 @@ public class DistributionActivityPosterServiceImpl extends ServiceImpl<Distribut
                 Integer left = Integer.valueOf(String.valueOf(cardObj.get("left")));
                 Integer width = Integer.valueOf(String.valueOf(cardObj.get("width")));
                 Integer height = Integer.valueOf(String.valueOf(cardObj.get("height")));
-                String qrTxt = sysTenant.getHostH5Seller()+"/pages/vcard/index?sellerCode="+sellerVo.getShareCode();
+                String qrTxt = "https://"+sysTenant.getHostH5Seller()+"/pages/vcard/index?shareCode="+sellerVo.getShareCode();
                 QRCodeWriter qrCodeWriter = new QRCodeWriter();
                 BitMatrix bitMatrix = qrCodeWriter.encode(qrTxt, BarcodeFormat.QR_CODE, width, height);
                 BufferedImage qrImage = ToolsUtils.toBufferedImage(bitMatrix);
@@ -136,7 +136,7 @@ public class DistributionActivityPosterServiceImpl extends ServiceImpl<Distribut
                 Integer left = Integer.valueOf(String.valueOf(disObj.get("left")));
                 Integer width = Integer.valueOf(String.valueOf(disObj.get("width")));
                 Integer height = Integer.valueOf(String.valueOf(disObj.get("height")));
-                String qrTxt = sysTenant.getHostH5Seller()+"/pages5/scan/retailact?shareCode="+sellerVo.getShareCode()+"&distributionId="+activityVo.getDistributionId()+"&linkCode="+linkCode;
+                String qrTxt = "https://"+sysTenant.getHostH5Seller()+"/pages5/scan/retailact?shareCode="+sellerVo.getShareCode()+"&distributionId="+activityVo.getDistributionId()+"&linkCode="+linkCode+"&distributionCode="+activityVo.getCode();
                 QRCodeWriter qrCodeWriter = new QRCodeWriter();
                 BitMatrix bitMatrix = qrCodeWriter.encode(qrTxt, BarcodeFormat.QR_CODE, width, height);
                 BufferedImage qrImage = ToolsUtils.toBufferedImage(bitMatrix);

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/vo/DistributionSellerVo.java

@@ -82,6 +82,7 @@ public class DistributionSellerVo {
 		this.setPassword(null);
 		this.setCash(null);
 		this.setUsedCash(null);
+		this.setFreezeCash(null);
 
 	}
 	@ApiModelProperty("邀请人姓名")
@@ -103,5 +104,8 @@ public class DistributionSellerVo {
 	@Excel(name = "已提现余额")
 	@ApiModelProperty("已提现余额")
 	private BigDecimal usedCash;
-
+	/** 冻结金额 */
+	@Excel(name = "冻结金额")
+	@ApiModelProperty("冻结金额")
+	private BigDecimal freezeCash;
 }

zhongzheng-system/src/main/resources/mapper/modules/distribution/DistributionActivityGoodsMapper.xml

@@ -4,6 +4,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zhongzheng.modules.distribution.mapper.DistributionActivityGoodsMapper">
 
-
+    <select id="getGoodsList" parameterType="com.zhongzheng.modules.distribution.bo.DistributionActivityGoodsQueryBo" resultType="com.zhongzheng.modules.activity.vo.ActivityGoodsPriceVo">
+        SELECT
+            g.cover_url,
+            g.goods_name,
+            gp.goods_price,
+            gp.goods_id
+        FROM
+            distribution_activity da
+                LEFT JOIN activity_goods_price gp ON da.`code` = gp.activity_code
+                LEFT JOIN goods g ON gp.goods_id = g.goods_id
+        WHERE
+            da.distribution_id = #{distributionId}
+          AND da.`status` = 1
+          AND gp.`status` = 1
+          AND g.goods_status = 1
+    </select>
 
 </mapper>