feat(customer): 添加信用额度申请删除功能并集成阳光接口

- 在PcCreditApplyController中添加删除信用额度申请接口
- 配置Nacos数据源配置文件引入
- 新增第三方订单新增接口实现
- 添加阳光推送拉取控制器及策略实现

pom.xml

@@ -126,6 +126,20 @@
             </properties>
 
         </profile>
+        <profile>
+            <id>hrx</id>
+            <properties>
+                <!-- 环境标识，需要与配置文件的名称相对应 -->
+                <profiles.active>hrx</profiles.active>
+                <profiles.active>5346d34f-9daf-4259-bc2f-5219f814987f</profiles.active>
+                <nacos.server>127.0.0.1:8848</nacos.server>
+                <nacos.discovery.group>DEFAULT_GROUP</nacos.discovery.group>
+                <nacos.config.group>DEFAULT_GROUP</nacos.config.group>
+                <nacos.username>nacos</nacos.username>
+                <nacos.password>nacos</nacos.password>
+                <logstash.address>127.0.0.1:4560</logstash.address>
+            </properties>
+        </profile>
         <profile>
             <id>prod</id>
             <properties>

ruoyi-auth/src/main/resources/application.yml

@@ -30,4 +30,5 @@ spring:
   config:
     import:
       - optional:nacos:application-common.yml
+      - optional:nacos:datasource.yml
       - optional:nacos:${spring.application.name}.yml

ruoyi-modules/ruoyi-customer/src/main/java/org/dromara/customer/controller/pc/PcCreditApplyController.java

@@ -1,9 +1,9 @@
 package org.dromara.customer.controller.pc;
 
+import jakarta.validation.constraints.NotEmpty;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.core.validate.AddGroup;
-import org.dromara.common.core.validate.EditGroup;
 import org.dromara.common.idempotent.annotation.RepeatSubmit;
 import org.dromara.common.log.annotation.Log;
 import org.dromara.common.log.enums.BusinessType;
@@ -12,13 +12,13 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.common.web.core.BaseController;
 import org.dromara.customer.domain.bo.CreditApplyBo;
-import org.dromara.customer.domain.bo.CustomerExpenseTypeBo;
 import org.dromara.customer.domain.vo.CreditApplyVo;
-import org.dromara.customer.domain.vo.CustomerExpenseTypeVo;
 import org.dromara.customer.service.ICreditApplyService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 @Validated
 @RequiredArgsConstructor
 @RestController
@@ -52,4 +52,16 @@ public class PcCreditApplyController extends BaseController {
 
         return toAjax(creditApplyService.insertByBo(bo));
     }
+
+    /**
+     * 删除信用额度申请
+     *
+     * @param ids 主键串
+     */
+    @Log(title = "信用额度申请", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable("ids") Long[] ids) {
+        return toAjax(creditApplyService.deleteWithValidByIds(List.of(ids), true));
+    }
 }

ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/controller/thirdparty/ThirdpartyController.java

@@ -126,6 +126,15 @@ public class ThirdpartyController {
         return R.ok();
     }
 
+    /**
+     * 订单新增
+     */
+    @PostMapping("/order/addOrder")
+    public R<ThirdpartyOrderDto> addOrder(@RequestBody ThirdpartyOrderBo bo) {
+        // TODO: 实现订单新增逻辑
+        return R.ok();
+    }
+
     /**
      * 订单查询
      */

ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/controller/yangguang/YangGuangPullController.java

@@ -0,0 +1,13 @@
+package org.dromara.external.controller.yangguang;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/yangguang/pull")
+public class YangGuangPullController {
+}

ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/controller/yangguang/YangGuangPushController.java

@@ -0,0 +1,13 @@
+package org.dromara.external.controller.yangguang;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/yangguang/api")
+public class YangGuangPushController {
+}

ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/handler/impl/YangGuangPushStrategy.java

@@ -0,0 +1,49 @@
+package org.dromara.external.handler.impl;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.external.api.zhongche.domain.vo.GoodsImageUpdateVo;
+import org.dromara.external.api.zhongche.domain.vo.GoodsPriceUpdateVo;
+import org.dromara.external.api.zhongche.domain.vo.GoodsStatusUpdateVo;
+import org.dromara.external.api.zhongche.domain.vo.GoodsUpdateVo;
+import org.dromara.external.domain.ExternalProduct;
+import org.dromara.external.handler.ProductPushStrategy;
+import org.dromara.product.api.domain.ProductVo;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component("yangguangPushStrategy")
+@RequiredArgsConstructor
+@Slf4j
+public class YangGuangPushStrategy implements ProductPushStrategy {
+    @Override
+    public void push(Long itemId, List<ExternalProduct> products) {
+
+    }
+
+    @Override
+    public GoodsPriceUpdateVo updatePrice(Long itemId, List<ProductVo> products) {
+        return null;
+    }
+
+    @Override
+    public GoodsStatusUpdateVo updateStatus(List<String> productNos, Integer status) {
+        return null;
+    }
+
+    @Override
+    public GoodsImageUpdateVo updateImages(Long itemId, List<ProductVo> products) {
+        return null;
+    }
+
+    @Override
+    public GoodsUpdateVo updateProperties(Long itemId, List<ProductVo> products) {
+        return null;
+    }
+
+    @Override
+    public GoodsUpdateVo updateDetail(Long itemId, List<ProductVo> products) {
+        return null;
+    }
+}