chenbiao il y a 3 ans
Parent
commit
4cfa447200

+ 10 - 3
netflix-service/src/main/java/com/cyksj/service/register/impl/RegisterOrderDonServiceImpl.java

@@ -1,7 +1,6 @@
 package com.cyksj.service.register.impl;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -12,7 +11,11 @@ import com.cyksj.common.util.Jsons;
 import com.cyksj.config.WeChatConfig;
 import com.cyksj.dto.RedisKey;
 import com.cyksj.mapper.RegisterOrderDonMapper;
+import com.cyksj.mapper.UserMapper;
 import com.cyksj.model.dto.H5JsPayParams;
+import com.cyksj.model.entity.RegisterOrderDon;
+import com.cyksj.model.entity.SysConfig;
+import com.cyksj.model.entity.User;
 import com.cyksj.model.entity.*;
 import com.cyksj.model.manage.request.RegisterReq;
 import com.cyksj.model.request.OrderAttach;
@@ -56,6 +59,8 @@ public class RegisterOrderDonServiceImpl extends ServiceImpl<RegisterOrderDonMap
 
     private final SysConfigService sysConfigService;
 
+    private final UserMapper userMapper;
+
     /**
      * 判断是否免费
      * @author chan
@@ -88,14 +93,16 @@ public class RegisterOrderDonServiceImpl extends ServiceImpl<RegisterOrderDonMap
     @Transactional(rollbackFor = Throwable.class)
     public RegisterOrderDon saveOrder(long userId, RegisterReq req, boolean isFree) throws Exception {
         RegisterOrderDon orderDon = new RegisterOrderDon();
+        User user = userMapper.selectById(userId);
         BeanUtil.copyProperties(req,orderDon);
         SysConfig register_price = sysConfigService.getOne(Wrappers.lambdaQuery(SysConfig.class).eq(SysConfig::getSysKey, "register_price").last("limit 1"));
-        Map<String, String> map = Jsons.toMap(register_price.getSysValue());
+        Map<String, Integer> map = Jsons.toMap(register_price.getSysValue());
 
         orderDon.setOrderNo(SEQUENCE.nextId() + "");
         orderDon.setUserId(userId);
+        orderDon.setOpenId(user.getOpenId());
         orderDon.setIsFree(isFree);
-        orderDon.setMoney(isFree ? BigDecimal.ZERO : new BigDecimal(map.get(req.getPlatform())));
+        orderDon.setMoney(isFree ? BigDecimal.ZERO : BigDecimal.valueOf(map.get(req.getPlatform())));
         orderDon.setStatus(isFree ? RegisterOrderDon.Status.hasPayment : RegisterOrderDon.Status.noPayment);
         save(orderDon);