فهرست منبع

feature: 消费服务
1.消费服务完

luoyb 1 سال پیش
والد
کامیت
c20aa3aa17

+ 1 - 1
ruoyi-server/ruoyi-server-consume/src/main/java/org/dromara/server/consume/controller/v1/ConsumeController.java

@@ -145,11 +145,11 @@ public class ConsumeController {
             return new ResponseEntity<Object>(result, null, HttpStatus.FORBIDDEN);
         }
         ConsumptionBo bo = recordConvertStrategy.convert(record, "YC");
+        ConsumptionBo cloudConsumeBo = BeanUtil.copyProperties(bo, ConsumptionBo.class);
         bo.setStatusFlag(4);
         bo.setUseType(SystemUseTypeEnum.CONSUME);
         bo.setCreditType(CreditTypeEnum.TERM_CONSUME);
 
-        ConsumptionBo cloudConsumeBo = BeanUtil.copyProperties(bo, ConsumptionBo.class);
         R<ErrorInfo> errorInfo;
         if (Objects.equals(type, "requestConsume")) {
             errorInfo = consumeBusiness.createOrder(bo, mac, xfPwd);

+ 5 - 0
ruoyi-server/ruoyi-server-mqdata/src/main/java/org/dromara/server/mq/event/kafka/impl/cloud/ConsumeEventStrategyImpl.java

@@ -6,6 +6,8 @@ import cn.hutool.json.JSONUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
+import org.dromara.common.core.enums.CreditTypeEnum;
+import org.dromara.common.core.enums.SystemUseTypeEnum;
 import org.dromara.common.message.kafka.constant.EventSenderConstants;
 import org.dromara.common.message.kafka.constant.EventTypeConstants;
 import org.dromara.consume.api.RemoteConsumeService;
@@ -34,6 +36,9 @@ public class ConsumeEventStrategyImpl implements IYktEventStrategy {
         if (ObjectUtil.equals(eventType, EventTypeConstants.CONSUME)) {
             ConsumptionBo consumptionBo = JSONUtil.toBean(JSONUtil.parseObj(msg), ConsumptionBo.class);
             RemoteConsumeBo recordBo = BeanUtil.copyProperties(consumptionBo, RemoteConsumeBo.class);
+            recordBo.setStatusFlag(4);
+            recordBo.setUseType(SystemUseTypeEnum.CONSUME);
+            recordBo.setCreditType(CreditTypeEnum.TERM_CONSUME);
             log.info("[处理本地->云端消费请求]-[消费信息:{}]", JSONUtil.toJsonStr(recordBo));
             remoteConsumeService.dealKafkaConsumeData(recordBo);
         }