submit

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

@@ -242,6 +242,11 @@ public class WxLoginService implements IWxLoginService {
         if (user == null) {
             throw new CustomException("登录错误");
         }
+        //如果活动分销码变动
+        if (StringUtils.isNotBlank(loginBody.getShareActivityCode())){
+            user.setShareActivityCode(loginBody.getShareActivityCode());
+            iUserService.updateById(user);
+        }
         ClientLoginUser loginUser = new ClientLoginUser();
         loginUser.setUser(user);
         Map<String, Object> map = new HashMap<>();
@@ -272,6 +277,11 @@ public class WxLoginService implements IWxLoginService {
         if (user == null) {
             throw new CustomException("登录错误");
         }
+        //如果活动分销码变动
+        if (StringUtils.isNotBlank(loginBody.getShareActivityCode())){
+            user.setShareActivityCode(loginBody.getShareActivityCode());
+            iUserService.updateById(user);
+        }
         ClientLoginUser loginUser = new ClientLoginUser();
         loginUser.setUser(user);
         Map<String, String> map = new HashMap<>();

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

@@ -341,4 +341,7 @@ public class GoodsVo {
 	@ApiModelProperty("显示排序字段")
 	private Long showSort;
 
+	@ApiModelProperty("是否二建商品：1是 0否")
+	private Integer specialGoods;
+
 }

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

@@ -45,4 +45,7 @@ public class WxLoginBody {
     @ApiModelProperty("分销码")
     private String shareCode;
 
+    @ApiModelProperty("活动分销码")
+    private String shareActivityCode;
+
 }

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

@@ -94,6 +94,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="specTemplateId" column="spec_template_id"/>
         <result property="showStatus" column="show_status"/>
         <result property="showSort" column="show_sort"/>
+        <result property="specialGoods" column="special_goods"/>
 
         <result property="supplyName" column="supply_name"/>
         <result property="educationName" column="education_name"/>
@@ -467,6 +468,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             cet.education_name,
             cpt.project_name,
             cb.business_name,
+            cb.template_status as special_goods,
             s.school_name,
             m.category_name,
             ot.type AS template_type,
@@ -543,6 +545,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             cet.education_name,
             cpt.project_name,
             cb.business_name,
+            cb.template_status AS special_goods,
             s.school_name,
             m.category_name,
             ot.type AS template_type,

zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeMapper.xml

@@ -458,13 +458,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND u.realname like concat('%', #{realname}, '%')
         </if>
         <if test="telphone != null and telphone != ''">
-            AND u.telphone = #{telphone}
+            AND u.telphone like concat('%', #{telphone}, '%')
         </if>
         <if test="companyName != null and companyName != ''">
             AND u.company_name like concat('%', #{companyName}, '%')
         </if>
         <if test="idCard != null and idCard != ''">
-            AND u.id_card = #{idCard}
+            AND u.id_card like concat('%', #{idCard}, '%')
         </if>
         <if test="idCards != null and idCards.size() != 0">
             AND u.id_card IN