submit

zhongzheng-admin/src/main/java/com/zhongzheng/controller/common/CommonController.java

@@ -288,6 +288,16 @@ public class CommonController extends BaseController {
         return AjaxResult.success(voList);
     }
 
+    @ApiOperation("校验用户是否有账号")
+    @PostMapping("common/check/account")
+    public AjaxResult checkUserAccount(@RequestBody UserGoodsListBo bo) {
+//        if (!ToolsUtils.checkSignFromOldSys(bo.getStamp().toString(), bo.getSign())) {
+//            return AjaxResult.error("签名错误");
+//        }
+        Map<String,String> url = iGoodsService.checkUserAccount(bo);
+        return AjaxResult.success(url);
+    }
+
     @ApiOperation("七大员学员资料批量变更")
     @PostMapping("common/apply/user/profile")
     public AjaxResult updateExamUserProfile(MultipartFile file) {

zhongzheng-framework/src/main/java/com/zhongzheng/framework/config/SecurityConfig.java

@@ -140,6 +140,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 .antMatchers("/common/merge/file").anonymous()
                 .antMatchers("/common/get/goods").anonymous()
                 .antMatchers("/common/get/orderGoods").anonymous()
+                .antMatchers("/common/check/account").anonymous()
                 .antMatchers("/common/apply/user/profile").anonymous()
                 .antMatchers("/common/get/goods/studyUrl").anonymous()
                 .antMatchers("/common/apply/detail").anonymous()

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

@@ -20,6 +20,9 @@ public class UserGoodsListBo implements Serializable {
     @ApiModelProperty("身份证")
     private String idNum;
 
+    @ApiModelProperty("密码")
+    private String password;
+
     @ApiModelProperty("当前时间戳")
     @NotBlank(message = "当前时间戳不能为空")
     private Long stamp;

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/mapper/GoodsMapper.java

@@ -84,5 +84,6 @@ public interface GoodsMapper extends BaseMapper<Goods> {
     @InterceptorIgnore(tenantLine = "true")
     Long getNewHandoutsId(@Param("handoutsName") String handoutsName,@Param("encoder") String encoder,@Param("newTenantId") Long newTenantId);
 
+    @InterceptorIgnore(tenantLine = "true")
     List<UserOrderGoodsListVo> getUserOrderGoodsList(Long userId);
 }

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

@@ -12,6 +12,7 @@ import com.zhongzheng.modules.grade.vo.SyncGoodsExport;
 
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 商品Service接口
@@ -145,4 +146,6 @@ public interface IGoodsService extends IService<Goods> {
 	String getBusinessName(Long goodsId);
 
 	List<UserOrderGoodsListVo> getUserOrderGoods(UserGoodsListBo bo);
+
+	Map<String,String> checkUserAccount(UserGoodsListBo bo);
 }

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

@@ -17,10 +17,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.Page;
 import com.zhongzheng.common.annotation.DataScope;
 import com.zhongzheng.common.core.redis.RedisCache;
+import com.zhongzheng.common.exception.BaseException;
 import com.zhongzheng.common.exception.CustomException;
-import com.zhongzheng.common.utils.DateUtils;
-import com.zhongzheng.common.utils.ServletUtils;
-import com.zhongzheng.common.utils.ToolsUtils;
+import com.zhongzheng.common.type.EncryptHandler;
+import com.zhongzheng.common.utils.*;
 import com.zhongzheng.common.utils.http.HttpUtils;
 import com.zhongzheng.modules.activity.domain.ActivityGoodsPrice;
 import com.zhongzheng.modules.activity.service.IActivityGoodsPriceService;
@@ -91,6 +91,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.io.IOException;
+import java.io.InputStream;
 import java.math.BigDecimal;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
@@ -5061,15 +5062,15 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
             switch (goodsVo.getCourseType()){
                 case 1://视频
                     h5Url = String.format("%s%s/pages/learn/index?skipPort=%s", URL_PREFIX, sysTenant.getHostH5(),key);
-                    pcUrl = String.format("%s%s/person-center/my-course?skipPort=%s", URL_PREFIX, sysTenant.getHostH5(),key);
+                    pcUrl = String.format("%s%s/person-center/my-course?skipPort=%s", URL_PREFIX, sysTenant.getHostPc(),key);
                     break;
                 case 2://题库
                     h5Url = String.format("%s%s/pages/questionBank/index?skipPort=%s", URL_PREFIX, sysTenant.getHostH5(),key);
-                    pcUrl = String.format("%s%s/person-center/my-bank/index?skipPort=%s", URL_PREFIX, sysTenant.getHostH5(),key);
+                    pcUrl = String.format("%s%s/person-center/my-bank/index?skipPort=%s", URL_PREFIX, sysTenant.getHostPc(),key);
                     break;
                 case 6://直播
                     h5Url = String.format("%s%s/pages/learn/index?skipPort=%s", URL_PREFIX, sysTenant.getHostH5(),key);
-                    pcUrl = String.format("%s%s/person-center/my-live?skipPort=%s", URL_PREFIX, sysTenant.getHostH5(),key);
+                    pcUrl = String.format("%s%s/person-center/my-live?skipPort=%s", URL_PREFIX, sysTenant.getHostPc(),key);
                     break;
             }
 
@@ -5087,6 +5088,45 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
         return voList;
     }
 
+    @Override
+    public Map<String,String> checkUserAccount(UserGoodsListBo bo) {
+        List<User> users = null;
+        if (StringUtils.isNotBlank(bo.getIdNum())){
+            users = iUserService.getUserByIdNumNotTenant(bo.getIdNum());
+        }
+        if (CollectionUtils.isEmpty(users)){
+            users = iUserService.getUserByTelNotTenant(bo.getTelphone());
+        }
+        if (CollectionUtils.isEmpty(users)) {
+            return null;
+        }
+        User user = users.stream().filter(x -> {
+            return SecurityUtils.matchesPassword(bo.getPassword(),x.getPassword());
+        } ).findFirst().orElse(null);
+        if (ObjectUtils.isNull(user)){
+            return null;
+        }
+        //新系统有账号
+        Long tenantId = user.getTenantId();
+        //缓存用户信息key
+        String key = String.format("KQTZ%s",user.getUserId());
+        SysTenant sysTenant = iSysTenantService.getById(tenantId);
+        //课程
+        String h5Url = String.format("%s%s/pages/learn/index?skipPort=%s", URL_PREFIX, sysTenant.getHostH5(),key);
+        String pcUrl = String.format("%s%s/person-center/my-course?skipPort=%s", URL_PREFIX, sysTenant.getHostPc(),key);
+        HashMap<String, String> map = new HashMap<>();
+        map.put("h5Url",h5Url);
+        map.put("pcUrl",pcUrl);
+        UserPhoneBo phoneBo = new UserPhoneBo();
+        phoneBo.setTelphone(bo.getTelphone());
+        phoneBo.setTenantId(tenantId);
+        phoneBo.setIdNum(bo.getIdNum());
+
+        //缓存用户信息
+        redisCache.setCacheObjectTenant(tenantId+":"+key, JSONObject.toJSONString(phoneBo), 12, TimeUnit.HOURS);
+        return map;
+    }
+
     private void updateHandoutsId(Long goodsId, Long tenantId, Long handoutsId) {
         baseMapper.updateHandoutsId(goodsId,tenantId,handoutsId);
     }

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

@@ -97,6 +97,10 @@ public class GoodsSpecTemplateServiceImpl extends ServiceImpl<GoodsSpecTemplateM
                             priceVo.setSpecAttrIds(x.getSpecAttributeIds());
                             priceVo.setSpecialGoods(0);
                             priceVo.setSpecialGoods(0);
+                            CourseBusiness business = courseBusinessService.getById(goods.getBusinessId());
+                            if (ObjectUtils.isNotNull(business.getTemplateStatus()) && business.getTemplateStatus() == 1){
+                                priceVo.setTemplateType("class");
+                            }
                             //商品业务类型
                             String businessName = goodsService.getGoodsBusinessName(x.getGoodsId());
                             if (businessName.contains("继续教育二级建造师")){

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

@@ -138,6 +138,8 @@ public class SpecAttrPriceVo implements Serializable {
     /** 显示排序字段 */
     @ApiModelProperty("是否二建商品：1是 0否")
     private Integer specialGoods;
+    /** 模版类型 */
+    private String templateType;
 
 
 }