修改交易的问题

src/main/java/com/dk/oauth/entity/CompanyResponse.java

@@ -31,6 +31,9 @@ public class CompanyResponse {
 
     private String gradeCode;
 
+    // 交易记录
+    private TradeResponse trade;
+
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @TableField(typeHandler = TimestampTypeHandler.class)
     private LocalDate endDate;

src/main/java/com/dk/oauth/entity/TradeResponse.java

@@ -129,4 +129,9 @@ public class TradeResponse   {
     @TableField(typeHandler = UuidTypeHandler.class)
     private String dkUserId;
 
+    /**
+     * 交易状态
+     */
+    private String tradeStatus;
+
 }

src/main/java/com/dk/oauth/service/impl/AuthAccessTokenServiceImpl.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dk.common.exception.BaseBusinessException;
 import com.dk.common.infrastructure.constant.Constant;
 import com.dk.common.infrastructure.constant.OauthConstants;
 import com.dk.common.infrastructure.enums.ErrorCodeEnum;
@@ -21,6 +22,7 @@ import com.dk.oauth.entity.*;
 import com.dk.oauth.feign.service.StaffFeign;
 import com.dk.oauth.mapper.AuthAccessTokenMapper;
 import com.dk.oauth.mapper.CompanyMapper;
+import com.dk.oauth.mapper.TradeMapper;
 import com.dk.oauth.mapper.UserMapper;
 import com.dk.oauth.service.IAuthAccessTokenService;
 import com.dk.oauth.shiro.jwt.JWTGenerator;
@@ -68,6 +70,7 @@ public class AuthAccessTokenServiceImpl extends ServiceImpl<AuthAccessTokenMappe
     @Resource
     private CompanyMapper companyMapper;
 
+
     @Value("${aes-key}")
     private String AESKey;
 
@@ -77,6 +80,9 @@ public class AuthAccessTokenServiceImpl extends ServiceImpl<AuthAccessTokenMappe
     @Autowired
     private WxConfig config;
 
+    @Autowired
+    private TradeMapper tradeMapper;
+
     @Resource
     private StaffFeign staffFeign;
 
@@ -537,6 +543,12 @@ public class AuthAccessTokenServiceImpl extends ServiceImpl<AuthAccessTokenMappe
                     company.setWxMaxNum(Integer.parseInt(licenseMap.get("wx_max_num").toString()));
                     company.setEndDate(LocalDate.parse(licenseMap.get("end_date").toString()));
                     company.setGradeCode(licenseMap.get("grade_code").toString());
+                }else{
+                    // 获取最近一次的交易记录
+                    List<TradeResponse> tradeResponses = tradeMapper.selectTrade(new Trade().setCpId(company.getCpId()));
+                    if(tradeResponses != null && tradeResponses.size() >0){
+                        company.setTrade(tradeResponses.get(0));
+                    }
                 }
                 JWTGenerator jwtGenerator = new JWTGenerator();
                 jwtGenerator.setSalt(username);

src/main/java/com/dk/oauth/service/impl/CompanyServiceImpl.java

@@ -183,12 +183,12 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
 //        company.setMaxStaffNum(1); // todo
 //        company.setCurStaffNum(1);
 
-//        // 标准版默认2099年，1PC授权，1WX授权
-//        if(Constant.GradeCode.STD.getName().equals(company.getGradeCode())){
-//            company.setEndDate(LocalDate.parse("2099-12-31"));
-//            companyVO.setWebMaxNum(0);
-//            companyVO.setWxMaxNum(1);
-//        }
+        // 标准版默认2099年，1PC授权，1WX授权
+        if(Constant.GradeCode.STD.getName().equals(company.getGradeCode())){
+            company.setEndDate(LocalDate.parse("2099-12-31"));
+            companyVO.setWebMaxNum(0);
+            companyVO.setWxMaxNum(1);
+        }
         company.setCpStatus("公司状态-通过");
         //获取具体服务的地址
         company.setSvcCode(companyMapper.selectServiceAllot(company.getGradeCode()));
@@ -214,20 +214,23 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
             request.setAttribute("svcCode", company.getSvcCode().replace("_", "-"));
         }
 
-        // 生成交易记录
         Trade trade = new Trade();
-        trade.setTradeNo(companyVO.getTradeNo());
-        trade.setCpId(company.getCpId());
-        trade.setWxUserId(companyVO.getWxUserId());
-        trade.setTradeAmount(companyVO.getTradeAmount());
-        trade.setTradeType(Constant.TradeType.REGISTER.getName());
-        trade.setBuyLong(companyVO.getBuyLong());
-        trade.setBuyBeginDate(companyVO.getBuyBeginDate());
-        trade.setBuyEndDate(companyVO.getBuyEndDate());
-        trade.setExtendDays(companyVO.getExtendDays());
-        trade.setBuyGradeCode(companyVO.getGradeCode());
-        trade.setTradeStatus(Constant.TradeStatus.INEFFECTIVE.getName());
-        tradeMapper.insert(trade);
+        // 专业版才插入交易记录
+        if(Constant.GradeCode.PRO.getName().equals(company.getGradeCode())) {
+            // 生成交易记录
+            trade.setTradeNo(companyVO.getTradeNo());
+            trade.setCpId(company.getCpId());
+            trade.setWxUserId(companyVO.getWxUserId());
+            trade.setTradeAmount(companyVO.getTradeAmount());
+            trade.setTradeType(Constant.TradeType.REGISTER.getName());
+            trade.setBuyLong(companyVO.getBuyLong());
+            trade.setBuyBeginDate(companyVO.getBuyBeginDate());
+            trade.setBuyEndDate(companyVO.getBuyEndDate());
+            trade.setExtendDays(companyVO.getExtendDays());
+            trade.setBuyGradeCode(companyVO.getGradeCode());
+            trade.setTradeStatus(Constant.TradeStatus.INEFFECTIVE.getName());
+            tradeMapper.insert(trade);
+        }
 
         // 组织机构 -顶级 和公司的名称一样
         //        二级 名称叫做 运营中心  返回的业务部门的id是运营中新的id

src/main/resources/mapper/TradeMapper.xml

@@ -106,6 +106,7 @@
         <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
             limit #{end} offset #{start}
         </if>
+        order by t.trade_time desc
     </select>
 
     <!-- 查询表t_cp_trade，（条件查询）个数 -->