fix 准备合并项目到微服务

xyzc-start/src/main/java/com/xyzc/start/controller/SchemeController.java

@@ -6,6 +6,7 @@ import com.xyzc.start.domain.vo.*;
 import com.xyzc.start.service.ISchemeService;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
+import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -22,6 +23,9 @@ public class SchemeController {
 
     private final ISchemeService schemeService;
 
+    @DubboReference(mock = "true")
+//    private final RemotePayService remotePayService;
+
     /**
      * 会员卡生效套餐信息
      */
@@ -52,6 +56,16 @@ public class SchemeController {
         return Result.ok(userOrder);
     }
 
+    /**
+     * 点击支付
+     */
+    @PostMapping("/orderPay")
+    public Result<String> orderPay(@RequestBody @Valid CreateOrderBo bo){
+
+        return Result.ok();
+    }
+
+
 
     /**
      * 燃料包生效套餐信息

xyzc-start/src/main/java/com/xyzc/start/domain/BaseUserOrder.java

@@ -23,6 +23,8 @@ public class BaseUserOrder {
 
     private Long baseUserId;
 
+    private Date createTime;
+
     private Integer status;
 
     private Long agentMerId;

xyzc-start/src/main/java/com/xyzc/start/service/ISchemeService.java

@@ -24,13 +24,6 @@ public interface ISchemeService {
      */
     SchemeVo getCurrentFuel();
 
-    /**
-     * 获取具体的燃料信息
-     *
-     * @param fuelId
-     * @return
-     */
-    List<FuelPackageVo> queryCurrentFuelById(Long fuelId);
 
     /**
      * 获取具体的会员卡信息

xyzc-start/src/main/java/com/xyzc/start/service/impl/SchemeServiceImpl.java

@@ -104,17 +104,6 @@ public class SchemeServiceImpl implements ISchemeService {
         return objects;
     }
 
-    /**
-     * 根据id获取燃料信息
-     *
-     * @param fuelId
-     * @return
-     */
-    @Override
-    public List<FuelPackageVo> queryCurrentFuelById(Long fuelId) {
-
-        return schemeMapper.queryFuelPackageById(fuelId);
-    }
 
     /**
      * 分页查询燃料规则详情
@@ -213,6 +202,7 @@ public class SchemeServiceImpl implements ISchemeService {
         convert.setBaseUserId(SecurityUser.getUserId());
         baseUserOrderMapper.insert(convert);
         baseUserOrderVo.setId(convert.getId());
+        baseUserOrderVo.setCreateTime(convert.getCreateTime());
 
         // 生成订单详情
         BaseUserOrderDetail baseUserOrderDetail = new BaseUserOrderDetail();
@@ -235,6 +225,8 @@ public class SchemeServiceImpl implements ISchemeService {
     }
 
 
+
+
     /**
      * 消费mq消息，拿到订单支付状态，修改订单状态
      */

xyzc-start/src/main/resources/mapper/WebStart/FuelPackageMapper.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xyzc.start.mapper.FuelPackageMapper">
+
+
+    <select id="queryOrderByFuelPackageId" resultType="com.xyzc.start.domain.vo.FuelPackageOrderVo">
+
+    </select>
+
+
+</mapper>