考场信息接口

jsjp-admin/src/main/java/com/miaxis/app/controller/wx/WxJsjpController.java

@@ -107,6 +107,7 @@ public class WxJsjpController extends BaseController {
         order.setUserName(gzptUserInfo.getUserName());
         order.setLogincode(gzptUserInfo.getLogincode());
         order.setGoodsName(sysDictData.getDictLabel());
+        order.setGoodsType(1);
         order.setPhoneType(wxOrderDTO.getPhoneType());  //手机类型
         order.setDqbh(gzptUserInfo.getCity());
         order.setDqmc(gzptUserInfo.getCityName());

jsjp-admin/src/main/java/com/miaxis/app/controller/wx/WxNotifyController.java

@@ -126,9 +126,17 @@ public class WxNotifyController {
 //        orderInfoService.writeVipDataToDb(wxJsOrder.getGoodsName(),wxJsOrder.getUserId(),wxJsOrder.getUserName(),wxJsOrder.getOutTradeNo(),wxJsOrder.getTotal(),1,
 //                wxJsOrder.getDqbh(),wxJsOrder.getDqmc(), wxJsOrder.getIsShare(),wxJsOrder.getSchool(),wxJsOrder.getSchoolName(),wxJsOrder.getSchoolCommission(),wxJsOrder.getPhoneType());
 
-        orderInfoService.writeVipDataToDb(wxJsOrder,1);
+        //
+        if(wxJsOrder.getGoodsType()==1) { //VIP套餐
+            orderInfoService.writeVipDataToDb(wxJsOrder,1);
+            wxJsOrderService.updateById(wxJsOrder);
+        }
+
+        if(wxJsOrder.getGoodsType()==2) { //考场
+            orderInfoService.writeExamDataToDb(wxJsOrder,1);
+            wxJsOrderService.updateById(wxJsOrder);
+        }
 
-        wxJsOrderService.updateById(wxJsOrder);
 
     }
 

jsjp-service/src/main/java/com/miaxis/exam/mapper/ExamInfoMapper.java

@@ -20,17 +20,7 @@ public interface ExamInfoMapper extends BaseMapper<ExamInfo> {
      * @param examInfo 考场信息
      * @return 考场信息集合
      */
-    public List<ExamInfo> selectExamInfoList(ExamInfo examInfo);
+    List<ExamInfo> selectExamInfoList(ExamInfo examInfo);
 
-    /**
-     * 获取考场存在的所有省份
-     * @return
-     */
-    List<ExamInfoProviceVo> getProvice();
 
-    /**
-     *
-     * @return
-     */
-    List<ExamInfoCityVo> getCity(String proviceId);
 }

jsjp-service/src/main/java/com/miaxis/examvip/domain/VipExamVideo.java

@@ -99,116 +99,11 @@ public class VipExamVideo extends BaseBusinessEntity {
     @ApiModelProperty(value = "考场名称")
     private String examName;
 
-    public void setId(Long id){
-        this.id = id;
-    }
-
-    public Long getId(){
-        return id;
-    }
-    public void setVideoName(String videoName){
-        this.videoName = videoName;
-    }
-
-    public String getVideoName(){
-        return videoName;
-    }
-    public void setVideoCover(String videoCover){
-        this.videoCover = videoCover;
-    }
-
-    public String getVideoCover(){
-        return videoCover;
-    }
-    public void setVideoUrl(String videoUrl){
-        this.videoUrl = videoUrl;
-    }
-
-    public String getVideoUrl(){
-        return videoUrl;
-    }
-    public void setVideoSubject(Long videoSubject){
-        this.videoSubject = videoSubject;
-    }
-
-    public Long getVideoSubject(){
-        return videoSubject;
-    }
-    public void setState(Long state){
-        this.state = state;
-    }
-
-    public Long getState(){
-        return state;
-    }
-    public void setHorizontal(Long horizontal){
-        this.horizontal = horizontal;
-    }
-
-    public Long getHorizontal(){
-        return horizontal;
-    }
-    public void setProvinceId(String provinceId){
-        this.provinceId = provinceId;
-    }
-
-    public String getProvinceId(){
-        return provinceId;
-    }
-    public void setCityId(String cityId){
-        this.cityId = cityId;
-    }
-
-    public String getCityId(){
-        return cityId;
-    }
-    public void setProvince(String province){
-        this.province = province;
-    }
-
-    public String getProvince(){
-        return province;
-    }
-    public void setCity(String city){
-        this.city = city;
-    }
-
-    public String getCity(){
-        return city;
-    }
-    public void setExamId(Long examId){
-        this.examId = examId;
-    }
-
-    public Long getExamId(){
-        return examId;
-    }
-    public void setExamName(String examName){
-        this.examName = examName;
-    }
-
-    public String getExamName(){
-        return examName;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("videoName", getVideoName())
-            .append("videoCover", getVideoCover())
-            .append("videoUrl", getVideoUrl())
-            .append("videoSubject", getVideoSubject())
-            .append("state", getState())
-            .append("horizontal", getHorizontal())
-            .append("provinceId", getProvinceId())
-            .append("cityId", getCityId())
-            .append("province", getProvince())
-            .append("city", getCity())
-            .append("createTime", getCreateTime())
-            .append("updateTime", getUpdateTime())
-            .append("examId", getExamId())
-            .append("examName", getExamName())
-            .toString();
-    }
+    /** 观看模式 0:免费 1:试看20秒  2:会员 */
+    @Excel(name = "观看模式")
+    @TableField("exam_name")
+    @ApiModelProperty(value = "观看模式 0:免费 1:试看20秒  2:会员")
+    private Integer permission;
+
+
 }

jsjp-service/src/main/java/com/miaxis/order/domain/OrderInfo.java

@@ -28,12 +28,24 @@ public class OrderInfo extends BaseBusinessEntity{
     @ApiModelProperty(value = "主键")
     private Long id;
 
+    /** 商品ID（考场ID或实物ID） */
+    @Excel(name = "商品ID（考场ID或实物ID）")
+    @TableField("goods_id")
+    @ApiModelProperty(value = "商品ID（考场ID或实物ID）")
+    private Long goodsId;
+
     /** 商品 */
     @Excel(name = "商品")
     @TableField("goods_name")
     @ApiModelProperty(value = "商品")
     private String goodsName;
 
+    /** 商品类型 1:VIP 2:考场 3:实物 */
+    @Excel(name = "商品类型 1:VIP 2:考场 3:实物")
+    @TableField("goods_type")
+    @ApiModelProperty(value = "商品")
+    private Integer goodsType;
+
     /** 用户ID */
     @Excel(name = "用户ID")
     @TableField("user_id")

jsjp-service/src/main/java/com/miaxis/order/service/IOrderInfoService.java

@@ -22,17 +22,19 @@ public interface IOrderInfoService extends IService<OrderInfo> {
      * @param orderInfo 订单信息
      * @return 订单信息集合
      */
-    public List<OrderInfo> selectOrderInfoList(OrderInfo orderInfo);
+    List<OrderInfo> selectOrderInfoList(OrderInfo orderInfo);
 
     OrderInfo getByOutTradeNo(String outTradeNo);
 
-    public void writeVipDataToDb(WxJsOrder order, int payType);
+    void writeVipDataToDb(WxJsOrder order, int payType);
 
-    public void writeVipDataToDb(String goodsName, Long userId, String userName, String outTrandeNo, Integer total, Integer payType);
+    void writeExamDataToDb(WxJsOrder order, int payType);
+
+    void writeVipDataToDb(String goodsName, Long userId, String userName, String outTrandeNo, Integer total, Integer payType);
 
     List<QuerySchoolOrderListVo> selectSchoolOrderInfoList(QuerySchoolOrderListDTO schoolOrderListDTO);
 
-    public void refundOrder(WxJsOrder order);
+    void refundOrder(WxJsOrder order);
 
     List<OrderInfo> selectSchoolOrderDetailed(QuerySchoolOrderListDTO schoolOrderListDTO);
 

jsjp-service/src/main/java/com/miaxis/order/service/impl/OrderInfoServiceImpl.java

@@ -1,6 +1,10 @@
 package com.miaxis.order.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.miaxis.exam.domain.ExamInfo;
+import com.miaxis.exam.service.IExamInfoService;
+import com.miaxis.examvip.domain.VipUserExam;
+import com.miaxis.examvip.service.IVipUserExamService;
 import com.miaxis.newgzpt.domain.GzptSchActivation;
 import com.miaxis.newgzpt.domain.GzptSchPayLog;
 import com.miaxis.newgzpt.domain.GzptUserInfo;
@@ -52,6 +56,12 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
     @Autowired
     private IGzptSchPayConfigService schPayConfigService;
 
+    @Autowired
+    private IExamInfoService examInfoService;
+
+    @Autowired
+    private IVipUserExamService vipUserExamService;
+
     /**
      * 查询订单信息列表
      *
@@ -78,6 +88,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
 
         OrderInfo orderInfo = new OrderInfo();
         orderInfo.setGoodsName(order.getGoodsName());
+        orderInfo.setGoodsType(order.getGoodsType());
         orderInfo.setUserId(order.getUserId());
         orderInfo.setUserName(order.getUserName());
         orderInfo.setLogincode(order.getLogincode());
@@ -892,6 +903,33 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
         }
     }
 
+    @Override
+    public void writeExamDataToDb(WxJsOrder order, int payType) {
+        OrderInfo orderInfo = new OrderInfo();
+        orderInfo.setGoodsId(order.getGoodsId());
+        orderInfo.setGoodsName(order.getGoodsName());
+        orderInfo.setGoodsType(order.getGoodsType());
+        orderInfo.setUserId(order.getUserId());
+        orderInfo.setOutTradeNo(order.getOutTradeNo());
+        orderInfo.setTotal(order.getTotal());
+        orderInfo.setTradeType(1);
+        orderInfo.setSuccessTime(order.getSuccessTime());
+        orderInfo.setPayType(payType);
+        orderInfo.setPhoneType(order.getPhoneType());
+
+        if(order.getGoodsType()==1) { //考场
+            //添加会员信息
+            ExamInfo examInfo = examInfoService.getById(order.getGoodsId());
+            VipUserExam vipUserExam = new VipUserExam();
+            vipUserExam.setUserId(order.getUserId());
+            vipUserExam.setExamId(examInfo.getId());
+            vipUserExam.setExamName(examInfo.getName());
+            vipUserExamService.save(vipUserExam);
+            this.save(orderInfo);
+        } else if(order.getGoodsType()==2) { //商品
+            //添加会员信息
+        }
+    }
 
 
     @Override

jsjp-service/src/main/java/com/miaxis/wx/domain/WxJsOrder.java

@@ -29,6 +29,12 @@ public class WxJsOrder extends BaseBusinessEntity{
     @ApiModelProperty(value = "id")
     private Long id;
 
+    /** 商品id */
+    @Excel(name = "商品id")
+    @TableField("goods_id")
+    @ApiModelProperty(value = "商品id")
+    private Long goodsId;
+
 
     /** 商品名称 */
     @Excel(name = "商品名称")
@@ -36,6 +42,13 @@ public class WxJsOrder extends BaseBusinessEntity{
     @ApiModelProperty(value = "商品名称")
     private String goodsName;
 
+    /** 商品类型 */
+    @Excel(name = "商品类型")
+    @TableField("goods_type")
+    @ApiModelProperty(value = "商品类型")
+    private Integer goodsType;
+
+
     /** 用户id */
     @Excel(name = "用户id")
     @TableField("user_id")

jsjp-service/src/main/resources/mapper/order/OrderInfoMapper.xml

@@ -6,7 +6,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <resultMap type="OrderInfo" id="OrderInfoResult">
         <result property="id"    column="id"    />
+        <result property="goodsId"    column="goods_id"    />
         <result property="goodsName"    column="goods_name"    />
+        <result property="goodsType"    column="goods_type"    />
         <result property="userId"    column="user_id"    />
         <result property="userName"    column="user_name"    />
         <result property="logincode"    column="logincode"    />
@@ -38,6 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="isShare != null"> and is_share = #{isShare }</if>
             <if test="goodsName != null  and goodsName != ''"> and goods_name like concat('%', #{goodsName}, '%')</if>
+            <if test="goodsType != null"> and goods_type = #{goodsType }</if>
             <if test="schoolName != null  and schoolName != ''"> and school_name like concat('%', #{schoolName}, '%')</if>
             <if test="userId != null "> and user_id = #{userId}</if>
             <if test="userName != null  and userName != ''"> and user_name like concat('%', #{userName}, '%')</if>

jsjp-service/src/main/resources/mapper/wx/WxJsOrderMapper.xml

@@ -6,7 +6,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <resultMap type="WxJsOrder" id="WxJsOrderResult">
         <result property="id"    column="id"    />
+        <result property="goodsId"    column="goods_id"    />
         <result property="goodsName"    column="goods_name"    />
+        <result property="goodsType"    column="goods_type"    />
         <result property="userId"    column="user_id"    />
         <result property="userName"    column="user_name"    />
         <result property="logincode"    column="logincode"    />