submit

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/bo/GoodsAddBo.java

@@ -186,4 +186,6 @@ public class GoodsAddBo {
     private Long showSort;
     @ApiModelProperty("外链")
     private String externalLink;
+    @ApiModelProperty("是否外链商品：0否 1是")
+    private Integer externalLinkStatus;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/bo/GoodsAttachedQueryBo.java

@@ -56,4 +56,8 @@ public class GoodsAttachedQueryBo extends BaseEntity {
 	private Long orderGoodsId;
 	@ApiModelProperty("试卷类型ID")
 	private Long paperId;
+	@ApiModelProperty("外链")
+	private String externalLink;
+	@ApiModelProperty("是否外链商品：0否 1是")
+	private Integer externalLinkStatus;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/bo/GoodsBankAddBo.java

@@ -130,4 +130,9 @@ public class GoodsBankAddBo {
     /** 显示排序字段 */
     @ApiModelProperty("显示排序字段")
     private Long showSort;
+
+    @ApiModelProperty("外链")
+    private String externalLink;
+    @ApiModelProperty("是否外链商品：0否 1是")
+    private Integer externalLinkStatus;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/bo/GoodsBankEditBo.java

@@ -159,4 +159,9 @@ public class GoodsBankEditBo {
     /** 显示排序字段 */
     @ApiModelProperty("显示排序字段")
     private Long showSort;
+
+    @ApiModelProperty("外链")
+    private String externalLink;
+    @ApiModelProperty("是否外链商品：0否 1是")
+    private Integer externalLinkStatus;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/bo/GoodsEditBo.java

@@ -220,4 +220,6 @@ public class GoodsEditBo {
     private Long showSort;
     @ApiModelProperty("外链")
     private String externalLink;
+    @ApiModelProperty("是否外链商品：0否 1是")
+    private Integer externalLinkStatus;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/domain/Goods.java

@@ -151,5 +151,7 @@ private static final long serialVersionUID=1L;
     private Long oId;
     /** 外链 */
     private String externalLink;
+    /** 是否外链商品：0否 1是 */
+    private Integer externalLinkStatus;
 
 }

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

@@ -88,6 +88,7 @@ import java.math.BigDecimal;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 import static java.math.RoundingMode.HALF_UP;
@@ -516,6 +517,12 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
     @Override
     @Transactional(rollbackFor = Exception.class)
     public synchronized Boolean insertByAddBo(GoodsAddBo bo) {
+        if (StringUtils.isNotBlank(bo.getExternalLink())){
+            Pattern pattern = Pattern.compile("^([hH][tT]{2}[pP]://|[hH][tT]{2}[pP][sS]://)(([A-Za-z0-9-~]+).)+([A-Za-z0-9-~\\/])+$");
+            if (!pattern.matcher(bo.getExternalLink()).matches()){
+                throw new CustomException("请输入正确的商品外链");
+            }
+        }
         Goods add = BeanUtil.toBean(bo, Goods.class);
         add.setCode(ServletUtils.getEncoded("SP"));
         validEntityBeforeSave(add);
@@ -564,6 +571,12 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Long insertBankByAddBo(GoodsBankAddBo bo) {
+        if (StringUtils.isNotBlank(bo.getExternalLink())){
+            Pattern pattern = Pattern.compile("^([hH][tT]{2}[pP]://|[hH][tT]{2}[pP][sS]://)(([A-Za-z0-9-~]+).)+([A-Za-z0-9-~\\/])+$");
+            if (!pattern.matcher(bo.getExternalLink()).matches()){
+                throw new CustomException("请输入正确的商品外链");
+            }
+        }
         Goods add = BeanUtil.toBean(bo, Goods.class);
         add.setCode(ServletUtils.getEncoded("SP"));
         validEntityBeforeSave(add);
@@ -592,6 +605,12 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean updateByEditBo(GoodsEditBo bo) {
+        if (StringUtils.isNotBlank(bo.getExternalLink())){
+            Pattern pattern = Pattern.compile("^([hH][tT]{2}[pP]://|[hH][tT]{2}[pP][sS]://)(([A-Za-z0-9-~]+).)+([A-Za-z0-9-~\\/])+$");
+            if (!pattern.matcher(bo.getExternalLink()).matches()){
+                throw new CustomException("请输入正确的商品外链");
+            }
+        }
         Goods update = BeanUtil.toBean(bo, Goods.class);
         validEntityBeforeSave(update);
         update.setUpdateTime(DateUtils.getNowTime());
@@ -691,6 +710,12 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean updateBankByEditBo(GoodsBankEditBo bo) {
+        if (StringUtils.isNotBlank(bo.getExternalLink())){
+            Pattern pattern = Pattern.compile("^([hH][tT]{2}[pP]://|[hH][tT]{2}[pP][sS]://)(([A-Za-z0-9-~]+).)+([A-Za-z0-9-~\\/])+$");
+            if (!pattern.matcher(bo.getExternalLink()).matches()){
+                throw new CustomException("请输入正确的商品外链");
+            }
+        }
         Goods update = BeanUtil.toBean(bo, Goods.class);
         validEntityBeforeSave(update);
         update.setUpdateTime(DateUtils.getNowTime());
@@ -778,6 +803,12 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
 
     @Override
     public boolean insertMakeByAddBo(GoodsAddBo bo) {
+        if (StringUtils.isNotBlank(bo.getExternalLink())){
+            Pattern pattern = Pattern.compile("^([hH][tT]{2}[pP]://|[hH][tT]{2}[pP][sS]://)(([A-Za-z0-9-~]+).)+([A-Za-z0-9-~\\/])+$");
+            if (!pattern.matcher(bo.getExternalLink()).matches()){
+                throw new CustomException("请输入正确的商品外链");
+            }
+        }
         Goods add = BeanUtil.toBean(bo, Goods.class);
         add.setCode(ServletUtils.getEncoded("SP"));
         validEntityBeforeSave(add);
@@ -789,6 +820,12 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
 
     @Override
     public boolean updateMakeByEditBo(GoodsEditBo bo) {
+        if (StringUtils.isNotBlank(bo.getExternalLink())){
+            Pattern pattern = Pattern.compile("^([hH][tT]{2}[pP]://|[hH][tT]{2}[pP][sS]://)(([A-Za-z0-9-~]+).)+([A-Za-z0-9-~\\/])+$");
+            if (!pattern.matcher(bo.getExternalLink()).matches()){
+                throw new CustomException("请输入正确的商品外链");
+            }
+        }
         Goods update = BeanUtil.toBean(bo, Goods.class);
         validEntityBeforeSave(update);
         update.setUpdateTime(DateUtils.getNowTime());
@@ -797,6 +834,12 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
 
     @Override
     public boolean insertFrontByAddBo(GoodsAddBo bo) {
+        if (StringUtils.isNotBlank(bo.getExternalLink())){
+            Pattern pattern = Pattern.compile("^([hH][tT]{2}[pP]://|[hH][tT]{2}[pP][sS]://)(([A-Za-z0-9-~]+).)+([A-Za-z0-9-~\\/])+$");
+            if (!pattern.matcher(bo.getExternalLink()).matches()){
+                throw new CustomException("请输入正确的商品外链");
+            }
+        }
         Goods add = BeanUtil.toBean(bo, Goods.class);
         add.setCode(ServletUtils.getEncoded("SP"));
         validEntityBeforeSave(add);
@@ -808,6 +851,12 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
 
     @Override
     public boolean updateFrontByEditBo(GoodsEditBo bo) {
+        if (StringUtils.isNotBlank(bo.getExternalLink())){
+            Pattern pattern = Pattern.compile("^([hH][tT]{2}[pP]://|[hH][tT]{2}[pP][sS]://)(([A-Za-z0-9-~]+).)+([A-Za-z0-9-~\\/])+$");
+            if (!pattern.matcher(bo.getExternalLink()).matches()){
+                throw new CustomException("请输入正确的商品外链");
+            }
+        }
         Goods update = BeanUtil.toBean(bo, Goods.class);
         validEntityBeforeSave(update);
         update.setUpdateTime(DateUtils.getNowTime());

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/vo/GoodsAttachedVo.java

@@ -86,4 +86,6 @@ public class GoodsAttachedVo {
 	private String paperName;
 	@ApiModelProperty("外链")
 	private String externalLink;
+	@ApiModelProperty("是否外链商品：0否 1是")
+	private Integer externalLinkStatus;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/vo/GoodsUserQuestionVo.java

@@ -278,4 +278,9 @@ public class GoodsUserQuestionVo {
 
 	@ApiModelProperty("试卷类型集合")
 	private List<ExamPaperVo> paperVos;
+
+	@ApiModelProperty("外链")
+	private String externalLink;
+	@ApiModelProperty("是否外链商品：0否 1是")
+	private Integer externalLinkStatus;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/vo/GoodsUserVo.java

@@ -389,5 +389,6 @@ public class GoodsUserVo {
 	private Integer goodsLearningOrder;
 	@ApiModelProperty("外链")
 	private String externalLink;
-
+	@ApiModelProperty("是否外链商品：0否 1是")
+	private Integer externalLinkStatus;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/vo/GoodsVo.java

@@ -347,4 +347,9 @@ public class GoodsVo {
 	@ApiModelProperty("商品复制时间")
 	private List<String> copyTime;
 
+	@ApiModelProperty("外链")
+	private String externalLink;
+	@ApiModelProperty("是否外链商品：0否 1是")
+	private Integer externalLinkStatus;
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/ClassGradeServiceImpl.java

@@ -74,6 +74,7 @@ import java.io.IOException;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 /**

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/vo/OrderGoodsVo.java

@@ -329,4 +329,7 @@ public class OrderGoodsVo {
 
 	@ApiModelProperty("外链")
 	private String externalLink;
+
+	@ApiModelProperty("是否外链商品：0否 1是")
+	private Integer externalLinkStatus;
 }

zhongzheng-system/src/main/resources/mapper/modules/bank/QuestionMapper.xml

@@ -145,6 +145,8 @@
         <result property="goodsPhotographConfig" column="goods_photograph_config"/>
         <result property="goodsPlayConfig" column="goods_play_config"/>
         <result property="goodsExamConfig" column="goods_exam_config"/>
+        <result property="externalLink" column="external_link"/>
+        <result property="externalLinkStatus" column="external_link_status"/>
 
         <result property="supplyName" column="supply_name"/>
         <result property="educationName" column="education_name"/>

zhongzheng-system/src/main/resources/mapper/modules/course/CourseMapper.xml

@@ -172,6 +172,7 @@
         <result property="rebuildStatus" column="rebuild_status"/>
         <result property="sectionMaxNum" column="section_max_num"/>
         <result property="externalLink" column="external_link"/>
+        <result property="externalLinkStatus" column="external_link_status"/>
 
         <result property="supplyName" column="supply_name"/>
         <result property="educationName" column="education_name"/>

zhongzheng-system/src/main/resources/mapper/modules/goods/GoodsAttachedMapper.xml

@@ -38,11 +38,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="code" column="code"/>
 		<result property="paperName" column="paper_name"/>
 		<result property="externalLink" column="external_link"/>
+		<result property="externalLinkStatus" column="external_link_status"/>
     </resultMap>
 
     <select id="getList" parameterType="com.zhongzheng.modules.goods.bo.GoodsAttachedQueryBo" resultMap="GoodsAttachedResultVo">
 		SELECT
 		    g.external_link,
+		    g.external_link_status,
 			ga.*,
 			CASE
 

zhongzheng-system/src/main/resources/mapper/modules/goods/GoodsMapper.xml

@@ -95,6 +95,8 @@
         <result property="showStatus" column="show_status"/>
         <result property="showSort" column="show_sort"/>
         <result property="specialGoods" column="special_goods"/>
+        <result property="externalLink" column="external_link"/>
+        <result property="externalLinkStatus" column="external_link_status"/>
 
         <result property="supplyName" column="supply_name"/>
         <result property="educationName" column="education_name"/>

zhongzheng-system/src/main/resources/mapper/modules/order/OrderGoodsMapper.xml

@@ -55,6 +55,7 @@
         <result property="realname" column="realname"/>
         <result property="rebuyOrderGoodsId" column="rebuy_order_goods_id"/>
         <result property="externalLink" column="external_link"/>
+        <result property="externalLinkStatus" column="external_link_status"/>
 
         <result property="code" column="code"/>
         <result property="goodsName" column="goods_name"/>