add 小程序扫码登录

zhongzheng-admin/src/main/java/com/zhongzheng/controller/course/CourseModuleController.java

@@ -156,7 +156,6 @@ public class CourseModuleController extends BaseController {
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         String operName = loginUser.getUsername();
         Map<String,Object> message = iCourseSectionService.importChapterSection(sectionList, businessList, operName);
-
         return AjaxResult.success(message);
     }
 }

zhongzheng-api/src/main/java/com/zhongzheng/controller/wx/WxLoginController.java

@@ -1,5 +1,6 @@
 package com.zhongzheng.controller.wx;
 
+import cn.hutool.core.lang.Validator;
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import com.zhongzheng.common.constant.Constants;
 import com.zhongzheng.common.core.domain.AjaxResult;
@@ -7,6 +8,7 @@ import com.zhongzheng.common.core.domain.entity.SysMenu;
 import com.zhongzheng.common.core.domain.entity.SysUser;
 import com.zhongzheng.common.core.domain.model.LoginBody;
 import com.zhongzheng.common.core.domain.model.LoginUser;
+import com.zhongzheng.common.core.redis.RedisCache;
 import com.zhongzheng.common.utils.ServletUtils;
 import com.zhongzheng.framework.web.service.*;
 import com.zhongzheng.modules.system.service.ISysMenuService;
@@ -23,6 +25,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.TimeUnit;
 
 @Api(tags ="微信登录用户操作管理")
 @ApiSupport(order = 2)
@@ -37,6 +40,8 @@ public class WxLoginController
 
     @Autowired
     private  IUserService iUserService;
+    @Autowired
+    private  RedisCache redisCache;
 
     /**
      * 登录方法
@@ -75,6 +80,22 @@ public class WxLoginController
         return AjaxResult.success(openId);
     }
 
+    @ApiOperation("小程序校验PC登录二维码")
+    @PostMapping("/scan_login_check")
+    public AjaxResult scan_login_check(@RequestParam("scanCode") String scanCode)
+    {
+        ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
+        String key = "SCAN_LOGIN_"+scanCode;
+        Long userId = redisCache.getCacheObject(key);
+        if(Validator.isNotEmpty(userId)){
+            redisCache.setCacheObject(key, loginUser.getUser().getUserId(),30, TimeUnit.SECONDS);//30秒锁定
+            return AjaxResult.success();
+        }else{
+            return AjaxResult.error("校验码不存在或已过期 ");
+        }
+
+    }
+
     /**
      * 公众号登录方法
      *

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseSectionServiceImpl.java

@@ -386,6 +386,8 @@ public class CourseSectionServiceImpl extends ServiceImpl<CourseSectionMapper, C
         int Index = 0;
         int total = 0;  //节的总数
         Map<String,List<CourseChapterSectionImport>> map = new HashMap();
+        System.out.println("节数据");
+        System.out.println(sectionList);
         for (CourseChapterSectionImport sectionImport : sectionList) {
             if(Validator.isEmpty(sectionImport.getChapterName())){
             //    errorLog+="第"+ (Index)+"条："+"节标题空白。\r\n";

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

@@ -45,4 +45,7 @@ public class OrderInputAddBo {
     /** 项目ID */
     @ApiModelProperty("项目ID")
     private Long projectId;
+    /** 旧业务系统订单号 */
+    @ApiModelProperty("旧业务系统订单号")
+    private String oldOrderSn;
 }

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

@@ -52,5 +52,7 @@ public class OrderInputEditBo {
     /** 项目ID */
     @ApiModelProperty("项目ID")
     private Long projectId;
-
+    /** 旧业务系统订单号 */
+    @ApiModelProperty("旧业务系统订单号")
+    private String oldOrderSn;
 }

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

@@ -67,4 +67,7 @@ public class OrderInputQueryBo extends BaseEntity {
 	private Long userId;
 	@ApiModelProperty("商品类型 1视频2题库 3面授 4服务 5组合")
 	private Integer goodsType;
+	/** 旧业务系统订单号 */
+	@ApiModelProperty("旧业务系统订单号")
+	private String oldOrderSn;
 }

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

@@ -1,5 +1,6 @@
 package com.zhongzheng.modules.order.bo;
 
+import com.zhongzheng.common.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -32,4 +33,12 @@ public class OrderUserCheckBuyBo {
     private String msg;
     @ApiModelProperty("是否购买过")
     private Boolean buy;
+    /** 服务有效期开始 */
+    @Excel(name = "服务有效期开始")
+    @ApiModelProperty("服务有效期开始")
+    private Long serviceStartTime;
+    /** 服务有效期结束 */
+    @Excel(name = "服务有效期结束")
+    @ApiModelProperty("服务有效期结束")
+    private Long serviceEndTime;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/domain/OrderInput.java

@@ -46,4 +46,6 @@ private static final long serialVersionUID=1L;
     private Long businessId;
     /** 项目ID */
     private Long projectId;
+    /** 旧业务系统订单号 */
+    private String oldOrderSn;
 }

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

@@ -259,6 +259,10 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             if(Validator.isNotEmpty(list1)&&list1.size()>0){
                 bo.setBuy(true);
             }
+            for(OrderGoodsVo vo : list1){
+                bo.setServiceEndTime(vo.getServiceEndTime());
+                bo.setServiceStartTime(vo.getServiceStartTime());
+            }
 /*            for(OrderGoodsVo goodsVo : list1){
 
                 if (goods.getGoodsType() == 6) {
@@ -643,7 +647,11 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         }
 
         add.setOrderSn(out_trade_no);
-        add.setOrderFrom(Order.FROM_INPUT);
+        if(Validator.isNotEmpty(bo.getOrderFrom())){
+            add.setOrderFrom(bo.getOrderFrom());
+        }else{
+            add.setOrderFrom(Order.FROM_INPUT);
+        }
         add.setPayPrice(payPrice);//需要支付价格
         add.setOrderPrice(totalPrice);//标准价格
         //有已收费的商品,修改订单支付状态

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

@@ -105,4 +105,8 @@ public class OrderInputVo {
 	private Integer goodsType;
 	@ApiModelProperty("商品成交价格")
 	private BigDecimal goodsRealPrice;
+	/** 旧业务系统订单号 */
+	@Excel(name = "旧业务系统订单号")
+	@ApiModelProperty("旧业务系统订单号")
+	private String oldOrderSn;
 }

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

@@ -40,5 +40,4 @@ public class WxLoginBody {
 
 
 
-
 }

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

@@ -15,6 +15,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="educationTypeId" column="education_type_id"/>
         <result property="businessId" column="business_id"/>
         <result property="projectId" column="project_id"/>
+        <result property="oldOrderSn" column="old_order_sn"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.order.vo.OrderInputVo" id="OrderInputVoResult">
@@ -46,6 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="goodsRefund" column="goods_refund"/>
         <result property="goodsType" column="goods_type"/>
         <result property="goodsRealPrice" column="goods_real_price"/>
+        <result property="oldOrderSn" column="old_order_sn"/>
     </resultMap>
 
     <select id="selectList" parameterType="com.zhongzheng.modules.order.bo.OrderInputQueryBo" resultMap="OrderInputVoResult">