金额购买修改

release-service/src/main/java/com/mmc/csf/release/controller/FlyerTrainingController.java

@@ -197,7 +197,8 @@ public class FlyerTrainingController extends BaseController {
         ResultBody resultBody = userAppApi.feignChangeUserPoints(request.getHeader("token"),request, - curriculumInfo.getRequireIntegral(), "购买课程");
         if("200".equals(resultBody.getCode())){
             CurriculumOrderDO curriculumOrderDO = new CurriculumOrderDO();
-            curriculumOrderDO.setUserAccountId(id);
+            curriculumOrderDO.setUserAccountId(this.getUserLoginInfoFromRedis(request).getUserAccountId());
+            curriculumOrderDO.setCurriculumInfoId(id);
             curriculumOrderDO.setJifenConsume(curriculumInfo.getRequireIntegral());
             // 生成支付流水号(规则"CO" + 时间戳 + 用户id + 随机数4位)
             curriculumOrderDO.setOrderNo("CO" + TDateUtil.getDateStr(new Date(), "yyyyMMddHHmmss") + id + CodeUtil.getRandomNum(4));
@@ -211,6 +212,7 @@ public class FlyerTrainingController extends BaseController {
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
     @PostMapping("/curriculumPayByMoney")
     public ResultBody curriculumPayByMoney(HttpServletRequest request,@RequestBody CurriculumPayVO curriculumPayVO) {
-        return  flyerTrainingService.curriculumPayByMoney(request,curriculumPayVO);
+
+        return  flyerTrainingService.curriculumPayByMoney(request,curriculumPayVO,this.getUserLoginInfoFromRedis(request).getUserAccountId());
     }
 }

release-service/src/main/java/com/mmc/csf/release/entity/curriculum/CurriculumOrderDO.java

@@ -62,5 +62,6 @@ public class CurriculumOrderDO implements Serializable {
      */
     private int jifenConsume;
 
+
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file

release-service/src/main/java/com/mmc/csf/release/service/FlyerTrainingService.java

@@ -146,7 +146,7 @@ public interface FlyerTrainingService {
      * @param curriculumPayVO
      * @return
      */
-    ResultBody curriculumPayByMoney(HttpServletRequest request, CurriculumPayVO curriculumPayVO);
+    ResultBody curriculumPayByMoney(HttpServletRequest request, CurriculumPayVO curriculumPayVO, Integer accountId);
 
 
 

release-service/src/main/java/com/mmc/csf/release/service/impl/FlyerTrainingServiceImpl.java

@@ -247,7 +247,7 @@ public class FlyerTrainingServiceImpl implements FlyerTrainingService {
     }
 
     @Override
-    public ResultBody curriculumPayByMoney(HttpServletRequest request,CurriculumPayVO curriculumPayVO) {
+    public ResultBody curriculumPayByMoney(HttpServletRequest request,CurriculumPayVO curriculumPayVO,Integer accountId) {
         //获取当前课程的内容
         CurriculumInfoDO curriculumInfoDO = flyerTrainingDao.selectCurriculumInfoById(curriculumPayVO.getId());
         // 获取支付类型
@@ -259,7 +259,7 @@ public class FlyerTrainingServiceImpl implements FlyerTrainingService {
         BigDecimal weChatPay = new BigDecimal(0);
         if (objects.contains("3")) {
             // 获取当前微信已经支付的金额
-            String json = stringRedisTemplate.opsForValue().get(curriculumPayVO.getPaymentOrderNumber() + curriculumPayVO.getId());
+            String json = stringRedisTemplate.opsForValue().get(curriculumPayVO.getPaymentOrderNumber() + accountId);
             GetOrderNumberDTO orderNumberDTO = JSONObject.parseObject(json, GetOrderNumberDTO.class);
             weChatPay = orderNumberDTO.getWeChatPay();
         }
@@ -279,7 +279,8 @@ public class FlyerTrainingServiceImpl implements FlyerTrainingService {
         tempTotalAmount = curriculumInfoDO.getRequireAmout().subtract(weChatPay);
 
         CurriculumOrderDO curriculumOrderDO = new CurriculumOrderDO();
-        curriculumOrderDO.setUserAccountId(curriculumInfoDO.getId());
+        curriculumOrderDO.setUserAccountId(accountId);
+        curriculumOrderDO.setCurriculumInfoId(curriculumInfoDO.getId());
         // 生成支付流水号(规则"CO" + 时间戳 + 用户id + 随机数4位)
         curriculumOrderDO.setOrderNo("CO" + TDateUtil.getDateStr(new Date(), "yyyyMMddHHmmss") + curriculumInfoDO.getId() + CodeUtil.getRandomNum(4));
 

release-service/src/main/resources/mapper/flyer/FlyerTrainingDao.xml

@@ -49,8 +49,6 @@
             <if test="wechatPayOrderNumber != null">wechat_pay_order_number,</if>
             <if test="curriculumInfoId != null">curriculum_info_id,</if>
             <if test="jifenConsume != null">jifen_consume,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="updateTime != null">update_time,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id,jdbcType=INTEGER},</if>
@@ -62,9 +60,7 @@
             <if test="weChat != null">#{weChat,jdbcType=DECIMAL},</if>
             <if test="wechatPayOrderNumber != null">#{wechatPayOrderNumber,jdbcType=VARCHAR},</if>
             <if test="curriculumInfoId != null">#{curriculumInfoId,jdbcType=VARCHAR},</if>
-            <if test="jifenConsume != null">#{jifenConsume,jdbcType=VARCHAR},,</if>
-            <if test="createTime != null">#{createTime,jdbcType=TIMESTAMP},</if>
-            <if test="updateTime != null">#{updateTime,jdbcType=TIMESTAMP},</if>
+            <if test="jifenConsume != null">#{jifenConsume,jdbcType=VARCHAR}</if>
         </trim>
     </insert>