fix

zhongzheng-api/src/main/java/com/zhongzheng/controller/order/OrderController.java

@@ -0,0 +1,79 @@
+package com.zhongzheng.controller.order;
+
+import com.zhongzheng.common.annotation.Log;
+import com.zhongzheng.common.core.controller.BaseController;
+import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.common.core.page.TableDataInfo;
+import com.zhongzheng.common.enums.BusinessType;
+import com.zhongzheng.modules.order.bo.OrderAddBo;
+import com.zhongzheng.modules.order.bo.OrderEditBo;
+import com.zhongzheng.modules.order.bo.OrderQueryBo;
+import com.zhongzheng.modules.order.service.IOrderService;
+import com.zhongzheng.modules.order.vo.OrderVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 订单Controller
+ *
+ * @author hjl
+ * @date 2021-05-19
+ */
+@Api(value = "订单控制器", tags = {"订单管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/order")
+public class OrderController extends BaseController {
+
+    private final IOrderService iOrderService;
+
+    /**
+     * 查询订单列表
+     */
+    @ApiOperation("查询订单列表")
+    @GetMapping("/list")
+    public TableDataInfo<OrderVo> list(OrderQueryBo bo) {
+        startPage();
+        List<OrderVo> list = iOrderService.queryList(bo);
+        return getDataTable(list);
+    }
+
+
+    /**
+     * 获取订单详细信息
+     */
+    @ApiOperation("获取订单详细信息")
+    @GetMapping("/{orderId}")
+    public AjaxResult<OrderVo> getInfo(@PathVariable("orderId" ) Long orderId) {
+        return AjaxResult.success(iOrderService.queryById(orderId));
+    }
+
+
+    /**
+     * 修改订单
+     */
+    @ApiOperation("修改订单")
+    @PreAuthorize("@ss.hasPermi('system:order:edit')")
+    @Log(title = "订单", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    public AjaxResult<Void> edit(@Validated  @RequestBody OrderEditBo bo) {
+        return toAjax(iOrderService.updateByEditBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 新增订单
+     */
+    @ApiOperation("新增订单")
+    @Log(title = "订单", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public AjaxResult<Void> add(@RequestBody OrderAddBo bo) {
+        return toAjax(iOrderService.insertByAddBo(bo) ? 1 : 0);
+    }
+}

zhongzheng-api/src/main/java/com/zhongzheng/controller/user/UserBankQuestionRecordController.java

@@ -0,0 +1,62 @@
+package com.zhongzheng.controller.user;
+
+import java.util.List;
+import java.util.Arrays;
+
+import com.zhongzheng.common.utils.ServletUtils;
+import com.zhongzheng.framework.web.service.WxTokenService;
+import com.zhongzheng.modules.user.bo.UserBankQuestionRecordQueryBo;
+import com.zhongzheng.modules.user.entity.ClientLoginUser;
+import com.zhongzheng.modules.user.service.IUserBankQuestionRecordService;
+import com.zhongzheng.modules.user.vo.UserBankQuestionRecordVo;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.zhongzheng.common.annotation.Log;
+import com.zhongzheng.common.core.controller.BaseController;
+import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.common.enums.BusinessType;
+import com.zhongzheng.common.utils.poi.ExcelUtil;
+import com.zhongzheng.common.core.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 用户做的历史题库题目记录Controller
+ *
+ * @author ruoyi
+ * @date 2021-06-28
+ */
+@Api(value = "用户做的历史题库题目记录控制器", tags = {"用户做的历史题库题目记录管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/bank/question/record")
+public class UserBankQuestionRecordController extends BaseController {
+
+    private final IUserBankQuestionRecordService iUserBankQuestionRecordService;
+
+    private final WxTokenService wxTokenService;
+
+    /**
+     * 查询用户做的历史题库题目记录列表
+     */
+    @ApiOperation("查询用户错题历史列表")
+    @PreAuthorize("@ss.hasPermi('system:record:list')")
+    @GetMapping("/list")
+    public TableDataInfo<UserBankQuestionRecordVo> list(UserBankQuestionRecordQueryBo bo) {
+        ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
+        bo.setUserId(loginUser.getUser().getUserId());
+        startPage();
+        List<UserBankQuestionRecordVo> list = iUserBankQuestionRecordService.queryWrongList(bo);
+        return getDataTable(list);
+    }
+
+}

zhongzheng-api/src/main/java/com/zhongzheng/controller/user/UserBankRecordController.java

@@ -3,9 +3,12 @@ package com.zhongzheng.controller.user;
 import java.util.List;
 import java.util.Arrays;
 
+import com.zhongzheng.common.utils.ServletUtils;
+import com.zhongzheng.framework.web.service.WxTokenService;
 import com.zhongzheng.modules.user.bo.UserBankRecordAddBo;
 import com.zhongzheng.modules.user.bo.UserBankRecordEditBo;
 import com.zhongzheng.modules.user.bo.UserBankRecordQueryBo;
+import com.zhongzheng.modules.user.entity.ClientLoginUser;
 import com.zhongzheng.modules.user.service.IUserBankRecordService;
 import com.zhongzheng.modules.user.vo.UserBankRecordVo;
 import lombok.RequiredArgsConstructor;
@@ -42,6 +45,8 @@ public class UserBankRecordController extends BaseController {
 
     private final IUserBankRecordService iUserBankRecordService;
 
+    private final WxTokenService wxTokenService;
+
     /**
      * 查询用户的做题历史列表
      */
@@ -71,6 +76,8 @@ public class UserBankRecordController extends BaseController {
     @Log(title = "用户的做题历史", businessType = BusinessType.INSERT)
     @PostMapping()
     public AjaxResult<Void> add(@RequestBody UserBankRecordAddBo bo) {
+        ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
+        bo.setUserId(loginUser.getUser().getUserId());
         return toAjax(iUserBankRecordService.insertByAddBo(bo) ? 1 : 0);
     }
 

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

@@ -8,6 +8,7 @@ import java.util.Date;
 
 
 import java.math.BigDecimal;
+import java.util.List;
 
 /**
  * 订单添加对象 order
@@ -19,40 +20,17 @@ import java.math.BigDecimal;
 @ApiModel("订单添加对象")
 public class OrderAddBo {
 
-    /** 订单编号 */
-    @ApiModelProperty("订单编号")
-    private String oderSn;
-    /** 用户ID */
-    @ApiModelProperty("用户ID")
-    private Long userId;
+    /** 优惠券ID */
+    @ApiModelProperty("优惠券ID")
+    private Long couponId;
     /** 订单价格 */
-    @ApiModelProperty("订单价格")
-    private BigDecimal orderPrice;
-    /** 支付订单号 */
-    @ApiModelProperty("支付订单号")
-    private String orderGeneral;
-    /** 订单状态 -2 超时关闭，-1手动关闭，0普通状态，1为已付款，3为成功 */
-    @ApiModelProperty("订单状态 -2 超时关闭，-1手动关闭，0普通状态，1为已付款，3为成功")
-    private Integer orderStatus;
+    @ApiModelProperty("商品列表")
+    private List<OrderGoodsAddBo> goodsList;
     /** 创建时间 */
     @ApiModelProperty("创建时间")
     private Long createTime;
     /** 更新时间 */
     @ApiModelProperty("更新时间")
     private Long updateTime;
-    /** 支付时间 */
-    @ApiModelProperty("支付时间")
-    private Long payTime;
-    /** 支付平台 1微信 2支付宝 */
-    @ApiModelProperty("支付平台 1微信 2支付宝")
-    private Integer payType;
-    /** 微信流水号 */
-    @ApiModelProperty("微信流水号")
-    private String transid;
-    /** 关闭时间 */
-    @ApiModelProperty("关闭时间")
-    private Long cancelTime;
-    /** 订单完成时间 */
-    @ApiModelProperty("订单完成时间")
-    private Long finishTime;
+
 }

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

@@ -0,0 +1,31 @@
+package com.zhongzheng.modules.order.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 订单添加对象 order
+ *
+ * @author hjl
+ * @date 2021-05-19
+ */
+@Data
+@ApiModel("订单商品添加对象")
+public class OrderGoodsAddBo {
+
+
+    /** 用户ID */
+    @ApiModelProperty("商品ID")
+    private Long goodsId;
+
+    /** 商品数量 */
+    @ApiModelProperty("商品数量")
+    private Integer num;
+    /** 类型 1课程 2题库 3考试重点 */
+    @ApiModelProperty("类型 1课程 2题库 3考试重点")
+    private Integer type;
+
+}

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

@@ -101,4 +101,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         }
         return this.removeByIds(ids);
     }
+
+    private OrderAddBo dealOrder(){
+        return null;
+    }
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserBankQuestionRecordAddBo.java

@@ -42,4 +42,6 @@ public class UserBankQuestionRecordAddBo {
     /** 更新时间 */
     @ApiModelProperty("更新时间")
     private Long updateTime;
+    @ApiModelProperty("用户ID")
+    private Long userId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserBankQuestionRecordQueryBo.java

@@ -54,5 +54,6 @@ public class UserBankQuestionRecordQueryBo extends BaseEntity {
 	/** 回复的json字符串 */
 	@ApiModelProperty("回复的json字符串")
 	private String replyStr;
-
+	@ApiModelProperty("用户ID")
+	private Long userId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserBankRecordAddBo.java

@@ -39,4 +39,6 @@ public class UserBankRecordAddBo {
     /** 更新时间 */
     @ApiModelProperty("用户答题数组")
     private List<UserBankQuestionRecordAddBo> answerList;
+    @ApiModelProperty("用户ID")
+    private Long userId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/domain/UserBankQuestionRecord.java

@@ -54,4 +54,6 @@ private static final long serialVersionUID=1L;
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private Long updateTime;
 
+    private Long userId;
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/domain/UserBankRecord.java

@@ -48,4 +48,5 @@ private static final long serialVersionUID=1L;
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private Long updateTime;
 
+    private Long userId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/mapper/UserBankQuestionRecordMapper.java

@@ -1,7 +1,11 @@
 package com.zhongzheng.modules.user.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.user.bo.UserBankQuestionRecordQueryBo;
 import com.zhongzheng.modules.user.domain.UserBankQuestionRecord;
+import com.zhongzheng.modules.user.vo.UserBankQuestionRecordVo;
+
+import java.util.List;
 
 /**
  * 用户做的历史题库题目记录Mapper接口
@@ -11,4 +15,6 @@ import com.zhongzheng.modules.user.domain.UserBankQuestionRecord;
  */
 public interface UserBankQuestionRecordMapper extends BaseMapper<UserBankQuestionRecord> {
 
+    List<UserBankQuestionRecordVo> queryWrongList(UserBankQuestionRecordQueryBo bo);
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/IUserBankQuestionRecordService.java

@@ -28,6 +28,11 @@ public interface IUserBankQuestionRecordService extends IService<UserBankQuestio
 	 */
 	List<UserBankQuestionRecordVo> queryList(UserBankQuestionRecordQueryBo bo);
 
+	/**
+	 * 查询错题列表
+	 */
+	List<UserBankQuestionRecordVo> queryWrongList(UserBankQuestionRecordQueryBo bo);
+
 	/**
 	 * 根据新增业务对象插入用户做的历史题库题目记录
 	 * @param bo 用户做的历史题库题目记录新增业务对象

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserBankQuestionRecordServiceImpl.java

@@ -9,7 +9,9 @@ import com.zhongzheng.modules.user.bo.UserBankQuestionRecordQueryBo;
 import com.zhongzheng.modules.user.domain.UserBankQuestionRecord;
 import com.zhongzheng.modules.user.mapper.UserBankQuestionRecordMapper;
 import com.zhongzheng.modules.user.service.IUserBankQuestionRecordService;
+import com.zhongzheng.modules.user.service.IUserPlanCourceService;
 import com.zhongzheng.modules.user.vo.UserBankQuestionRecordVo;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -30,6 +32,9 @@ import java.util.stream.Collectors;
 @Service
 public class UserBankQuestionRecordServiceImpl extends ServiceImpl<UserBankQuestionRecordMapper, UserBankQuestionRecord> implements IUserBankQuestionRecordService {
 
+    @Autowired
+    private UserBankQuestionRecordMapper userBankQuestionRecordMapper;
+
     @Override
     public UserBankQuestionRecordVo queryById(Long replyId){
         UserBankQuestionRecord db = this.baseMapper.selectById(replyId);
@@ -48,6 +53,11 @@ public class UserBankQuestionRecordServiceImpl extends ServiceImpl<UserBankQuest
         return entity2Vo(this.list(lqw));
     }
 
+    @Override
+    public List<UserBankQuestionRecordVo> queryWrongList(UserBankQuestionRecordQueryBo bo) {
+        return userBankQuestionRecordMapper.queryWrongList(bo);
+    }
+
     /**
     * 实体类转化成视图对象
     *

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserBankRecordServiceImpl.java

@@ -83,6 +83,7 @@ public class UserBankRecordServiceImpl extends ServiceImpl<UserBankRecordMapper,
             for(UserBankQuestionRecordAddBo item : bo.getAnswerList()){
                 item.setBankId(bo.getBankId());
                 item.setRecordId(recordId);
+                item.setUserId(bo.getUserId());
                 iUserBankQuestionRecordService.insertByAddBo(item);
             }
             return true;

zhongzheng-system/src/main/java/com/zhongzheng/modules/wx/service/IWxPayService.java

@@ -24,7 +24,7 @@ public interface IWxPayService {
 	 * 查询单个
 	 * @return
 	 */
-	Map<String, Object> payment(String polyvId) throws Exception;
+	Map<String, String> payment(String polyvId) throws Exception;
 
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/wx/service/impl/WxPayServiceImpl.java

@@ -81,7 +81,7 @@ public class WxPayServiceImpl  implements IWxPayService {
 
 
     @Override
-    public Map<String, Object> payment(String polyvId) throws Exception {
+    public Map<String, String> payment(String polyvId) throws Exception {
         WxSmallConfig config = new WxSmallConfig(appid,mchid,key);
         WXPay wxpay = new WXPay(config);
         SnowflakeIdUtils idWorker = new SnowflakeIdUtils(3, 1);
@@ -102,13 +102,14 @@ public class WxPayServiceImpl  implements IWxPayService {
         try {
             Map<String, String> resp = wxpay.unifiedOrder(data);
 
-            Map<String, Object> result = new HashMap<>();
-            result.put("provider","wxpay");
+            Map<String, String> result = new HashMap<>();
+   //         result.put("provider","wxpay");
+            result.put("appId",appid);
+            result.put("timeStamp",String.valueOf(DateUtils.getNowTime()));
             result.put("nonceStr",resp.get("nonce_str"));
             result.put("package","prepay_id="+resp.get("prepay_id"));
             result.put("signType","MD5");
-            result.put("paySign",resp.get("sign"));
-            result.put("timeStamp",DateUtils.getNowTime());
+            result.put("sign", WXPayUtil.generateSignature(result, key, WXPayConstants.SignType.MD5));
             System.out.println(resp);
             return result;
         } catch (Exception e) {

zhongzheng-system/src/main/resources/mapper/modules/user/UserBankQuestionRecordMapper.xml

@@ -14,7 +14,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="replyStr" column="reply_str"/>
         <result property="createTime" column="create_time"/>
         <result property="updateTime" column="update_time"/>
+        <result property="userId" column="user_id"/>
     </resultMap>
 
+    <select id="queryWrongList" parameterType="com.zhongzheng.modules.user.domain.UserBankQuestionRecord"  resultType="com.zhongzheng.modules.bank.domain.Question">
+        SELECT
+        ubqr.is_right,
+        q.*
+        FROM
+        user_bank_question_record ubqr
+        LEFT JOIN question q ON ubqr.question_id = q.question_id
+        WHERE
+        1 = 1
+        <if test="userId != null and userId != ''">
+            AND user_id = #{userId}
+        </if>
+        AND ubqr.bank_id = #{bankId}
+        GROUP BY
+        ubqr.question_id
+        HAVING
+        ubqr.is_right = 0
+
+    </select>
 
 </mapper>

zhongzheng-system/src/main/resources/mapper/modules/user/UserBankRecordMapper.xml

@@ -12,6 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="bankId" column="bank_id"/>
         <result property="createTime" column="create_time"/>
         <result property="updateTime" column="update_time"/>
+        <result property="userId" column="user_id"/>
     </resultMap>