Merge branch 'dev'

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

@@ -5,6 +5,7 @@ import com.zhongzheng.common.core.controller.BaseController;
 import com.zhongzheng.common.core.domain.AjaxResult;
 import com.zhongzheng.common.core.page.TableDataInfo;
 import com.zhongzheng.common.core.redis.RedisCache;
+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;
@@ -16,6 +17,8 @@ import com.zhongzheng.modules.course.service.ICourseTopicService;
 import com.zhongzheng.modules.course.vo.CourseTopicGoodsVo;
 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.goods.service.IGoodsSpecTemplateService;
 import com.zhongzheng.modules.goods.vo.GoodsSpecTemplateVo;
 import com.zhongzheng.modules.goods.vo.GoodsUserVo;
@@ -68,6 +71,8 @@ public class CommonController extends BaseController {
 
     private final ISysTenantService iSysTenantService;
 
+    private final IDataWxTpClickService iDataWxTpClickService;
+
     /**
      * 获取微信小程序信息（网页跳转小程序）
      */
@@ -283,4 +288,20 @@ public class CommonController extends BaseController {
         return toAjax(iCourseService.checkTime()? 1 : 0);
     }
 
+    /**
+     * 领取题库活动记录
+     */
+    @ApiOperation("领取题库活动记录")
+    @GetMapping("/save/activity/record/{crowdType}")
+    public AjaxResult<Void> saveActivityRecord(@PathVariable("crowdType") Integer crowdType) {
+        DataWxTpClick dataWxTpClick = new DataWxTpClick();
+        dataWxTpClick.setCrowdType(crowdType);
+        dataWxTpClick.setCreateTime(DateUtils.getNowTime());
+        dataWxTpClick.setType(2);
+        dataWxTpClick.setStatus(1);
+        dataWxTpClick.setInformId(0L);
+        dataWxTpClick.setUpdateTime(DateUtils.getNowTime());
+        return toAjax(iDataWxTpClickService.save(dataWxTpClick)? 1 : 0);
+    }
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/data/bo/DataWxTpClickAddBo.java

@@ -2,9 +2,7 @@ package com.zhongzheng.modules.data.bo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
-import java.util.Date;
 
 
 
@@ -30,4 +28,10 @@ public class DataWxTpClickAddBo {
     /** 状态 1有效 0无效 */
     @ApiModelProperty("状态 1有效 0无效")
     private Integer status;
+    /** 类型：1其他，2真题免费领取活动记录 */
+    @ApiModelProperty("类型：1其他，2真题免费领取活动记录 ")
+    private Integer type;
+    /** 类型：1其他，2真题免费领取活动记录 */
+    @ApiModelProperty("类型：1其他，2真题免费领取活动记录 ")
+    private Integer crowdType;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/data/domain/DataWxTpClick.java

@@ -1,13 +1,14 @@
 package com.zhongzheng.modules.data.domain;
 
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
+
 import java.io.Serializable;
-import java.util.Date;
-import java.math.BigDecimal;
-import com.zhongzheng.common.annotation.Excel;
 
 /**
  * 微信模板消息点击数据对象 data_wx_tp_click
@@ -36,4 +37,9 @@ private static final long serialVersionUID=1L;
     private Long updateTime;
     /** 状态 1有效 0无效 */
     private Integer status;
+    /** 类型：1其他，2真题免费领取活动记录 */
+    private Integer type;
+    /** 人群类型 */
+    private Integer crowdType;
+
 }

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

@@ -1253,16 +1253,16 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
     public String getGoodsStudyUrl(GoodsStudyUrlBo bo) {
         String url = "";
         //中正学堂PC域名和H5域名 https://zzyxt.gdzzkj.net/  h.gdzzkj.net
-//        String domain = "http://192.168.1.222:6002/";
-//        String domainH5 = "http://120.79.166.78:19006";
-        String domain = "https://zzyxt.gdzzkj.net/";
-        String domainH5 = "https://h.gdzzkj.net";
+        String domain = "http://192.168.1.222:6002/";
+        String domainH5 = "http://120.79.166.78:19006";
+//        String domain = "https://zzyxt.gdzzkj.net/";
+//        String domainH5 = "https://h.gdzzkj.net";
         Long tenantId = 867735392558919680L; //祥粤云
         if (ObjectUtils.isNotNull(bo.getTenantId()) && bo.getTenantId().equals(tenantId)){
-            domain = "https://web.xyyxt.net/";
-            domainH5 = "https://h.xyyxt.net";
-//            domain = "http://192.168.1.222:6002/";
-//            domainH5 = "http://120.79.166.78:19006";
+//            domain = "https://web.xyyxt.net/";
+//            domainH5 = "https://h.xyyxt.net";
+            domain = "http://192.168.1.222:6002/";
+            domainH5 = "http://120.79.166.78:19006";
         }
         Goods goods = baseMapper.queryGoodsByIdTenant(bo.getGoodsId(), bo.getTenantId());
         if (ObjectUtils.isNull(goods)) {

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderAddBo.java

@@ -2,10 +2,7 @@ package com.zhongzheng.modules.order.bo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
-import java.util.Date;
-
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -97,4 +94,6 @@ public class OrderAddBo {
     private Integer orderOrg;
     @ApiModelProperty("红包活动码")
     private String shareActivityCode;
+    @ApiModelProperty("业务员名称")
+    private String sellerName;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderServiceImpl.java

@@ -1939,7 +1939,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         record.setUserId(add.getUserId());
         record.setGoodsId(goodsList.get(0).getGoodsId());
         record.setStatus(1);
-        record.setRemark("真题领取活动");
+        record.setRemark(String.format("业务员名称：%s",bo.getSellerName()));
         record.setType(2);
         record.setCreateTime(DateUtils.getNowTime());
         record.setUpdateTime(DateUtils.getNowTime());