hgw 3 年之前
父节点
当前提交
22dd3dddc3

+ 2 - 1
mec-biz/src/main/java/com/ym/mec/biz/dal/dto/PayParamBasicDto.java

@@ -2,11 +2,12 @@ package com.ym.mec.biz.dal.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 
+import java.io.Serializable;
 import java.util.List;
 
 import com.ym.mec.common.entity.BaseEntity;
 
-public class PayParamBasicDto extends BaseEntity {
+public class PayParamBasicDto extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "是否使用余额", required = false)
     private Boolean isUseBalancePayment = false;
 

+ 1 - 1
mec-biz/src/main/java/com/ym/mec/biz/service/impl/MemberRankSettingServiceImpl.java

@@ -225,13 +225,13 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
         StudentPaymentOrder studentPaymentOrder = sysCouponCodeService.use(dto.getCouponIdList(), amount, true, CouponDetailTypeEnum.getAllowType(MEMBER));
         //写入redis证明是活动购买
         String orderNo = idGeneratorService.generatorId("payment") + "";
-        studentPaymentOrder.setOrderNo(orderNo);
         RBucket<Object> cache = redissonClient.getBucket(BUY_2_QQHE_LOCK + orderNo);
         Map<String, Object> cacheMap = new HashMap<>();
         cacheMap.put("totalMonth", totalMonth);
         cacheMap.put("dto", dto);
         cache.set(cacheMap, 40, TimeUnit.MINUTES);
         //创建订单
+        studentPaymentOrder.setOrderNo(orderNo);
         Map<String, Object> result = getMap(dto.getAmount(), dto.getUseBalancePayment(), sysUser.getId(), sysUser.getOrganId(), studentPaymentOrder);
         return BaseController.succeed(result);
     }

+ 3 - 1
mec-common/common-core/src/main/java/com/ym/mec/common/entity/BaseEntity.java

@@ -2,7 +2,9 @@ package com.ym.mec.common.entity;
 
 import com.ym.mec.common.tenant.TenantContextHolder;
 
-public class BaseEntity {
+import java.io.Serializable;
+
+public class BaseEntity implements Serializable {
 
 	private Integer tenantId = TenantContextHolder.getTenantId();