修改支付流程

mec-biz/src/main/java/com/ym/mec/biz/service/impl/TenantInfoServiceImpl.java

@@ -441,14 +441,7 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
      */
     public Map<String, Object> tenantOpenPay(Integer tenantId) throws Exception {
         TenantOrderRecordEnum tenantEnum = TenantOrderRecordEnum.TENANT_OPEN;
-        RBucket<Map<String, Object>> cacheOrder = cacheOrder(tenantEnum.getCode() + ":" + tenantId);
-        Map<String, Object> result = cacheOrder.get();
-        if (Objects.nonNull(result)) {
-            return result;
-        } else {
-            result = new HashMap<>();
-        }
-
+        Map<String, Object> result = new HashMap<>();
         TenantProductInfo productInfo = getProductInfo(tenantId);
         //生成订单编号
         String orderNo = idGenerator.generatorId("payment") + "";
@@ -467,8 +460,6 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
                     1,//todo 机构开通付款临时写死
                     tenantEnum.getCode()
             );
-            //将数据缓存起来避免重复生成订单数据，如果这次没有支付 3分钟内可以重复支付
-            cacheOrder.set(result, 3L, TimeUnit.MINUTES);
         } else {
             //已支付
             orderState = 1;
@@ -492,13 +483,7 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
      */
     public Map<String, Object> tenantRenewPay(Integer tenantId, Integer val) throws Exception {
         TenantOrderRecordEnum tenantEnum = TenantOrderRecordEnum.TENANT_RENEW;
-        RBucket<Map<String, Object>> cacheOrder = cacheOrder(tenantEnum.getCode() + ":" + tenantId + ":" + val);
-        Map<String, Object> result = cacheOrder.get();
-        if (Objects.nonNull(result)) {
-            return result;
-        } else {
-            result = new HashMap<>();
-        }
+        Map<String, Object> result = new HashMap<>();
         TenantProductInfo productInfo = getProductInfo(tenantId);
         //续费时 取合同价
         BigDecimal amount = productInfo.getContractPrice().multiply(new BigDecimal(val));
@@ -520,8 +505,6 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
             );
             //操作续费信息，把续费周期存起来
             opsRenewInfo(tenantId).set(val, 1, TimeUnit.HOURS);
-            //将数据缓存起来避免重复生成订单数据，如果这次没有支付 3分钟内可以重复支付
-            cacheOrder.set(result, 3L, TimeUnit.MINUTES);
         } else {
             //续费成功
             renewSuccess(val, productInfo, amount);

mec-biz/src/main/java/com/ym/mec/biz/service/impl/TenantOrderRecordServiceImpl.java

@@ -156,8 +156,6 @@ public class TenantOrderRecordServiceImpl extends ServiceImpl<TenantOrderRecordD
         productInfo.setPayDate(new Date());
         productInfo.setTenantId(record.getTenantId());
         tenantProductInfoService.updateById(productInfo);
-        //删除订单数据及订单缓存
-        tenantInfoService.cacheOrder(TenantOrderRecordEnum.TENANT_RENEW + ":" + record.getTenantId()).delete();
     }
 
     private void renew(TenantOrderRecord record) {
@@ -170,8 +168,6 @@ public class TenantOrderRecordServiceImpl extends ServiceImpl<TenantOrderRecordD
         //修改产品信息
         tenantInfoService.renewSuccess(val, productInfo, record.getActualAmount());
         //删除订单数据及订单缓存
-        bucket.delete();
-        tenantInfoService.cacheOrder(TenantOrderRecordEnum.TENANT_RENEW + ":" + record.getTenantId() + ":" + val).delete();
     }
 
     //主动去第三方查询订单状态