Merge branch 'master' of http://1.14.104.71:10880/root/ylrz_scrm_java

fs-ad-api/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>fs-ad-api</artifactId>
     <description>
-       投流接口
+       投流接口服务
     </description>
     <dependencies>
 

fs-admin/pom.xml

@@ -12,7 +12,7 @@
     <artifactId>fs-admin</artifactId>
     <version>1.1.16</version>
     <description>
-        后台入口
+        管理后台服务
     </description>
 
 

fs-admin/src/main/java/com/fs/company/controller/CompanyController.java

@@ -183,7 +183,7 @@ public class CompanyController extends BaseController
     public AjaxResult resetPwd(@PathVariable Long companyId)
     {
         Company company=companyService.selectCompanyById(companyId);
-        return toAjax(userService.resetUserPwdByUserId(company.getUserId(),SecurityUtils.encryptPassword("123456")));
+        return toAjax(userService.resetUserPwdByUserId(company.getUserId(),SecurityUtils.encryptPassword("cq654321!!")));
     }
 
 //    @PreAuthorize("@ss.hasPermi('company:company:resetMoney')")

fs-admin/src/main/java/com/fs/web/controller/system/SysLoginController.java

@@ -1,27 +1,28 @@
 package com.fs.web.controller.system;
 
-import java.util.List;
-import java.util.Set;
-
+import com.fs.common.constant.Constants;
+import com.fs.common.core.domain.AjaxResult;
 import com.fs.common.core.domain.R;
+import com.fs.common.core.domain.entity.SysMenu;
+import com.fs.common.core.domain.entity.SysUser;
 import com.fs.common.core.redis.RedisCache;
+import com.fs.common.utils.PatternUtils;
+import com.fs.common.utils.ServletUtils;
 import com.fs.core.security.LoginBody;
 import com.fs.core.security.LoginUser;
 import com.fs.core.security.SecurityUtils;
+import com.fs.core.web.service.SysLoginService;
+import com.fs.core.web.service.SysPermissionService;
+import com.fs.core.web.service.TokenService;
+import com.fs.system.service.ISysMenuService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
-import com.fs.common.constant.Constants;
-import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.core.domain.entity.SysMenu;
-import com.fs.common.core.domain.entity.SysUser;
-import com.fs.common.utils.ServletUtils;
-import com.fs.core.web.service.SysLoginService;
-import com.fs.core.web.service.SysPermissionService;
-import com.fs.core.web.service.TokenService;
-import com.fs.system.service.ISysMenuService;
+
+import java.util.List;
+import java.util.Set;
 
 /**
  * 登录验证
@@ -57,6 +58,9 @@ public class SysLoginController
     {
 
         try{
+            if (!PatternUtils.checkPassword(loginBody.getPassword())) {
+                return R.error("密码格式不正确,需包含字母、数字和特殊字符,长度为 8-20 位");
+            }
 
             // 生成令牌
             String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),

fs-admin/src/main/java/com/fs/web/controller/system/SysProfileController.java

@@ -1,28 +1,23 @@
 package com.fs.web.controller.system;
 
-import java.io.IOException;
-
-import com.fs.core.security.LoginUser;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
 import com.fs.common.annotation.Log;
 import com.fs.common.config.FSConfig;
 import com.fs.common.core.controller.BaseController;
 import com.fs.common.core.domain.AjaxResult;
 import com.fs.common.core.domain.entity.SysUser;
 import com.fs.common.enums.BusinessType;
-import com.fs.core.security.SecurityUtils;
+import com.fs.common.utils.PatternUtils;
 import com.fs.common.utils.ServletUtils;
 import com.fs.common.utils.file.FileUploadUtils;
+import com.fs.core.security.LoginUser;
+import com.fs.core.security.SecurityUtils;
 import com.fs.core.web.service.TokenService;
 import com.fs.system.service.ISysUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
 
 /**
  * 个人信息 业务处理
@@ -88,6 +83,11 @@ public class SysProfileController extends BaseController
         {
             return AjaxResult.error("修改密码失败，旧密码错误");
         }
+
+        if (!PatternUtils.checkPassword(newPassword)) {
+            return AjaxResult.error("新密码格式不正确,需包含字母、数字和特殊字符,长度为 8-20 位");
+        }
+
         if (SecurityUtils.matchesPassword(newPassword, password))
         {
             return AjaxResult.error("新密码不能与旧密码相同");

fs-api/pom.xml

@@ -10,7 +10,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>fs-api</artifactId>
-
+    <description>
+        统一接口回调服务
+    </description>
     <properties>
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
@@ -139,4 +141,4 @@
         <finalName>${project.artifactId}</finalName>
     </build>
 
-</project>
+</project>

fs-common/src/main/java/com/fs/common/utils/PatternUtils.java

@@ -0,0 +1,17 @@
+package com.fs.common.utils;
+
+import java.util.regex.Pattern;
+
+public class PatternUtils {
+
+    private final static Pattern PWD = Pattern.compile("^(?=.*[A-Za-z])(?=.*\\d)(?=.*[^A-Za-z0-9]).{8,20}$");
+
+    /**
+     * 校验密码是否符合条件
+     * @param value 密码
+     * @return boolean
+     */
+    public static boolean checkPassword(String value) {
+        return PWD.matcher(value).matches();
+    }
+}

fs-company-app/pom.xml

@@ -17,7 +17,7 @@
     </properties>
 
     <description>
-       APP入口
+       销售移动端接口服务
     </description>
 
     <dependencies>

fs-company/pom.xml

@@ -11,7 +11,9 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>fs-company</artifactId>
 
-
+    <description>
+        销售端接口服务
+    </description>
     <dependencies>
 
         <dependency>

fs-company/src/main/java/com/fs/company/controller/CompanyLoginController.java

@@ -1,16 +1,12 @@
 package com.fs.company.controller;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-
+import com.fs.common.constant.Constants;
+import com.fs.common.core.domain.AjaxResult;
 import com.fs.common.core.redis.RedisCache;
+import com.fs.common.utils.PatternUtils;
+import com.fs.common.utils.ServletUtils;
 import com.fs.company.domain.CompanyMenu;
 import com.fs.company.domain.CompanyUser;
-import com.fs.company.param.LoginToken;
 import com.fs.company.service.ICompanyMenuService;
 import com.fs.core.security.LoginBody;
 import com.fs.core.security.LoginUser;
@@ -22,9 +18,10 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
-import com.fs.common.constant.Constants;
-import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.utils.ServletUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
 
 /**
  * 登录验证
@@ -57,6 +54,10 @@ public class CompanyLoginController
     @PostMapping("/login")
     public AjaxResult login(@RequestBody LoginBody loginBody)
     {
+        if (!PatternUtils.checkPassword(loginBody.getPassword())) {
+            return AjaxResult.error("密码格式不正确,需包含字母、数字和特殊字符,长度为 8-20 位");
+        }
+
         AjaxResult ajax = AjaxResult.success();
         // 生成令牌
         String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),

fs-company/src/main/java/com/fs/company/controller/CompanyProfileController.java

@@ -1,33 +1,27 @@
 package com.fs.company.controller;
 
-import java.io.IOException;
-
-import com.fs.company.domain.Company;
+import com.fs.common.annotation.Log;
+import com.fs.common.config.FSConfig;
+import com.fs.common.core.controller.BaseController;
+import com.fs.common.core.domain.AjaxResult;
+import com.fs.common.enums.BusinessType;
+import com.fs.common.utils.PatternUtils;
+import com.fs.common.utils.ServletUtils;
+import com.fs.common.utils.file.FileUploadUtils;
 import com.fs.company.domain.CompanyUser;
 import com.fs.company.domain.CompanyVoiceCaller;
 import com.fs.company.param.CompanyUserEditParam;
 import com.fs.company.service.ICompanyUserService;
 import com.fs.company.service.ICompanyVoiceCallerService;
 import com.fs.core.security.LoginUser;
+import com.fs.core.security.SecurityUtils;
 import com.fs.core.web.service.TokenService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
-import com.fs.common.annotation.Log;
-import com.fs.common.config.FSConfig;
-import com.fs.common.core.controller.BaseController;
-import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.enums.BusinessType;
-import com.fs.core.security.SecurityUtils;
-import com.fs.common.utils.ServletUtils;
-import com.fs.common.utils.file.FileUploadUtils;
+
+import java.io.IOException;
 
 /**
  * 个人信息
@@ -108,6 +102,11 @@ public class CompanyProfileController extends BaseController
         {
             return AjaxResult.error("新密码不能与旧密码相同");
         }
+
+        if (!PatternUtils.checkPassword(newPassword)) {
+            return AjaxResult.error("新密码格式不正确,需包含字母、数字和特殊字符,长度为 8-20 位");
+        }
+
         if (userService.resetUserPwd(userName, SecurityUtils.encryptPassword(newPassword)) > 0)
         {
             // 更新缓存用户密码

fs-company/src/main/java/com/fs/company/controller/CompanyUserController.java

@@ -1,13 +1,18 @@
 package com.fs.company.controller;
 
-import java.util.Date;
-import java.util.List;
-import java.util.stream.Collectors;
-
 import cn.hutool.json.JSONUtil;
+import com.fs.common.annotation.Log;
+import com.fs.common.constant.UserConstants;
+import com.fs.common.core.controller.BaseController;
+import com.fs.common.core.domain.AjaxResult;
 import com.fs.common.core.domain.R;
-
+import com.fs.common.core.page.TableDataInfo;
+import com.fs.common.enums.BusinessType;
 import com.fs.common.utils.DomainUtil;
+import com.fs.common.utils.PatternUtils;
+import com.fs.common.utils.ServletUtils;
+import com.fs.common.utils.StringUtils;
+import com.fs.common.utils.poi.ExcelUtil;
 import com.fs.company.domain.*;
 import com.fs.company.param.CompanyUserAreaParam;
 import com.fs.company.param.CompanyUserQwParam;
@@ -15,27 +20,20 @@ import com.fs.company.service.*;
 import com.fs.company.vo.CompanyUserQwListVO;
 import com.fs.company.vo.CompanyUserVO;
 import com.fs.core.security.LoginUser;
+import com.fs.core.security.SecurityUtils;
 import com.fs.core.web.service.TokenService;
 import com.fs.course.config.CourseConfig;
-import com.fs.qw.vo.CompanyUserQwVO;
-import com.fs.qw.vo.QwUserVO;
 import com.fs.his.vo.OptionsVO;
+import com.fs.qw.vo.QwUserVO;
 import com.fs.system.service.ISysConfigService;
-import com.fs.system.vo.DictVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
-import com.fs.common.annotation.Log;
-import com.fs.common.constant.UserConstants;
-import com.fs.common.core.controller.BaseController;
-import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.core.page.TableDataInfo;
-import com.fs.common.enums.BusinessType;
-import com.fs.core.security.SecurityUtils;
-import com.fs.common.utils.ServletUtils;
-import com.fs.common.utils.StringUtils;
-import com.fs.common.utils.poi.ExcelUtil;
+
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
 
 
 /**
@@ -175,6 +173,10 @@ public class CompanyUserController extends BaseController
     @PostMapping
     public AjaxResult add(@Validated @RequestBody CompanyUser user)
     {
+        if (!PatternUtils.checkPassword(user.getPassword())) {
+            return AjaxResult.error("密码格式不正确,需包含字母、数字和特殊字符,长度为 8-20 位");
+        }
+
         //判断用户数量是否已达到上线
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         Integer count=companyUserService.selectCompanyUserCountByCompanyId(loginUser.getCompany().getCompanyId());
@@ -240,6 +242,9 @@ public class CompanyUserController extends BaseController
     @PutMapping("/resetPwd")
     public AjaxResult resetPwd(@RequestBody CompanyUser user)
     {
+        if (!PatternUtils.checkPassword(user.getPassword())) {
+            return AjaxResult.error("密码格式不正确,需包含字母、数字和特殊字符,长度为 8-20 位");
+        }
         return toAjax(companyUserService.resetUserPwdByUserId(user.getUserId(), SecurityUtils.encryptPassword(user.getPassword())));
     }
 

fs-qw-api/pom.xml

@@ -13,7 +13,7 @@
     <groupId>com.fs</groupId>
     <artifactId>fs-qw-api</artifactId>
     <description>
-        企微API
+        企微API回调服务
     </description>
 
     <dependencies>

fs-qw-task/pom.xml

@@ -13,7 +13,7 @@
     <groupId>com.fs</groupId>
     <artifactId>fs-qw-task</artifactId>
     <description>
-        企微定时任务
+        企微定时任务服务
     </description>
 
     <dependencies>

fs-qwhook-msg/pom.xml

@@ -10,7 +10,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>fs-qwhook-msg</artifactId>
-
+    <description>
+        企微插件消息队列订阅服务
+    </description>
     <dependencies>
 
         <!-- spring-boot-devtools -->

fs-qwhook-sop/pom.xml

@@ -10,7 +10,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>fs-qwhook-sop</artifactId>
-
+    <description>
+        企微侧边栏接口服务
+    </description>
     <dependencies>
 
         <!-- spring-boot-devtools -->

fs-qwhook/pom.xml

@@ -8,9 +8,10 @@
         <version>1.1.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-
     <artifactId>fs-qwhook</artifactId>
-
+    <description>
+        企微插件WEBSOCKET服务
+    </description>
     <dependencies>
 
         <!-- spring-boot-devtools -->

fs-service-system/src/main/java/com/fs/course/service/impl/FsCourseQuestionBankServiceImpl.java

@@ -175,11 +175,12 @@ public class FsCourseQuestionBankServiceImpl implements IFsCourseQuestionBankSer
 
             rightLog = courseAnswerLogsMapper.selectRightLogByCourseVideo(param.getVideoId(), param.getUserId(), param.getQwUserId());
             if (rightLog != null) {
-//                if (log.getRewardType() != null) {
-//                    return R.error("该课程已答题完成，不可重复答题");
-//                } else {
-//                }
-                return R.error("该课程已答题完成，不可重复答题");
+                if (log.getRewardType() != null) {
+                    return R.error("该课程已答题完成，不可重复答题");
+                } else {
+                    return R.ok("答题成功");
+                }
+//                return R.error("该课程已答题完成，不可重复答题");
             }
             errorCount = courseAnswerLogsMapper.selectErrorCountByCourseVideo(param.getVideoId(), param.getUserId(),param.getQwUserId());
         }

fs-service-system/src/main/java/com/fs/kingbos/service/K9OrderService.java

@@ -1,5 +1,6 @@
 package com.fs.kingbos.service;
 
+import com.fs.erp.dto.ErpOrderResponse;
 import com.fs.kingbos.domian.KingbosOrderRequest;
 import com.fs.kingbos.domian.KingbosOrderResponse;
 import com.fs.kingbos.domian.KingbosRefundOrderRequest;
@@ -11,5 +12,7 @@ public interface K9OrderService {
 
     KingbosOrderResponse refundOrder(KingbosRefundOrderRequest request);
 
-    void createOmsOrder(Long orderId,String orderStatus);
+    ErpOrderResponse addOmsOrder(Long orderId);
+
+    ErpOrderResponse refundOmsOrder(Long orderId);
 }

fs-service-system/src/main/java/com/fs/kingbos/service/impl/K9OrderServiceImpl.java

@@ -1,12 +1,18 @@
 package com.fs.kingbos.service.impl;
 
 import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.http.HttpUtil;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.PropertyNamingStrategy;
+import com.alibaba.fastjson.parser.ParserConfig;
 import com.fs.common.config.FSSysConfig;
 import com.fs.common.exception.ServiceException;
 import com.fs.common.utils.StringUtils;
+import com.fs.erp.dto.ErpOrderResponse;
+import com.fs.erp.dto.wdt.ErpWdtApiResponse;
 import com.fs.kingbos.domian.*;
 import com.fs.kingbos.enums.OrderStatusEnum;
 import com.fs.kingbos.service.K9OrderService;
@@ -26,6 +32,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 
+import java.io.IOException;
 import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -83,10 +90,44 @@ public class K9OrderServiceImpl implements K9OrderService {
         return response;
     }
 
+    @Override
+    public ErpOrderResponse addOmsOrder(Long orderId) {
+        try {
+            KingbosOrderResponse response = this.createOmsOrder(orderId, NO_DELIVERED.getCode());
+            if (response.getIsSuccess()){
+                log.info("订单推送成功: {}", response);
+                ErpOrderResponse erpOrderResponse = new ErpOrderResponse();
+                erpOrderResponse.setCode(response.getCbilid());
+                return erpOrderResponse;
+            }else {
+                throw new RuntimeException(String.format("订单推送失败,原因: %s",response.getErrmsg()));
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return new ErpOrderResponse();
+    }
 
     @Override
-    @Transactional
-    public void createOmsOrder(Long orderId,String orderStatus){
+    public ErpOrderResponse refundOmsOrder(Long orderId) {
+        try {
+            KingbosOrderResponse response = this.createOmsOrder(orderId, CANCELLED.getCode());
+            if (response.getIsSuccess()){
+                log.info("订单推送成功: {}", response);
+                ErpOrderResponse erpOrderResponse = new ErpOrderResponse();
+                erpOrderResponse.setCode(response.getCbilid());
+                return erpOrderResponse;
+            }else {
+                throw new RuntimeException(String.format("订单推送失败,原因: %s",response.getErrmsg()));
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return new ErpOrderResponse();
+    }
+
+
+    private KingbosOrderResponse createOmsOrder(Long orderId,String orderStatus){
         logger.info("【金博网络订单】开始创建订单，订单ID: {}", orderId);
         try {
             // 1. 获取订单信息并验证
@@ -103,15 +144,16 @@ public class K9OrderServiceImpl implements K9OrderService {
 
             // 4. 发送订单请求
             KingbosOrderResponse response = sendOrderRequest(data, d1Datas);
-            if (response.getIsSuccess()){
-                FsStoreOrder order1 = new FsStoreOrder();
-                order1.setId(order.getId());
-                order1.setExtendOrderId(response.getCbilid());
-                fsStoreOrderMapper.updateFsStoreOrder(order1);
-                logger.info("【金博网络订单】订单创建完成，订单ID: {}", orderId);
-            }else {
-                logger.error("【金博网络订单】创建订单失败，订单ID: {}, 错误信息: {}", orderId, response.getErrmsg());
-            }
+            return response;
+//            if (response.getIsSuccess()){
+//                FsStoreOrder order1 = new FsStoreOrder();
+//                order1.setId(order.getId());
+//                order1.setExtendOrderId(response.getCbilid());
+//                fsStoreOrderMapper.updateFsStoreOrder(order1);
+//                logger.info("【金博网络订单】订单创建完成，订单ID: {}", orderId);
+//            }else {
+//                logger.error("【金博网络订单】创建订单失败，订单ID: {}, 错误信息: {}", orderId, response.getErrmsg());
+//            }
         } catch (Exception e) {
             logger.error("【金博网络订单】创建订单失败，订单ID: {}, 错误信息: {}", orderId, e.getMessage(), e);
             throw e;

fs-service-system/src/main/java/com/fs/store/mapper/FsStoreProductMapper.java

@@ -192,7 +192,7 @@ public interface FsStoreProductMapper
             "and find_in_set(#{companyIds}, company_ids) " +
             "</if>" +
             "</script>"})
-    Long selectFsStoreProductCount(@Param("type") int type,@Param("companyIds") Long companyIds);
+    Long selectFsStoreProductCompanyCount(@Param("type") int type,@Param("companyIds") Long companyIds);
 
     @Select({"<script> " +
             "select * from fs_store_product where find_in_set(product_id,#{ids})  " +

fs-service-system/src/main/java/com/fs/store/service/impl/FsStoreProductServiceImpl.java

@@ -656,7 +656,7 @@ public class FsStoreProductServiceImpl implements IFsStoreProductService
 
     @Override
     public Long selectFsStoreProductCount(int type, Long companyId) {
-        return fsStoreProductMapper.selectFsStoreProductCount(type,companyId);
+        return fsStoreProductMapper.selectFsStoreProductCompanyCount(type,companyId);
     }
 
     @Override

fs-user-app/pom.xml

@@ -11,7 +11,7 @@
 
     <artifactId>fs-user-app</artifactId>
     <description>
-        用户APP接口
+        用户移动端接口服务
     </description>
 
 

fs-user-app/src/main/java/com/fs/app/controller/StoreOrderController.java

@@ -20,6 +20,7 @@ import com.fs.erp.service.IErpOrderService;
 import com.fs.huifuPay.domain.HuiFuCreateOrder;
 import com.fs.huifuPay.domain.HuifuCreateOrderResult;
 import com.fs.huifuPay.service.HuiFuService;
+import com.fs.kingbos.service.K9OrderService;
 import com.fs.pay.pay.domain.OrderResult;
 import com.fs.pay.pay.dto.OrderQueryDTO;
 import com.fs.pay.pay.service.PayService;
@@ -60,6 +61,8 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 
+import static com.fs.kingbos.enums.OrderStatusEnum.NO_DELIVERED;
+
 
 @Api("商城接口")
 @RestController
@@ -104,6 +107,26 @@ public class StoreOrderController extends  AppBaseController {
     PayService ybPayService;
     @Autowired
     private HuiFuService huiFuService;
+    @Autowired
+    K9OrderService k9OrderService;
+
+
+    @ApiOperation("测试ERP")
+    @GetMapping("/test")
+    public R test(){
+        k9OrderService.addOmsOrder(172L);
+//        k9OrderService.refundOmsOrder(172L);
+        return R.ok();
+    }
+
+
+    @ApiOperation("测试ERP")
+    @GetMapping("/test2")
+    public R test2(){
+        k9OrderService.refundOmsOrder(172L);
+//        k9OrderService.refundOmsOrder(172L);
+        return R.ok();
+    }
 
 
     @Login

pom.xml

@@ -12,7 +12,7 @@
             <artifactId>spring-context</artifactId>
         </dependency>
     </dependencies>
-    <name>fs</name>
+    <name>ylrz-scrm</name>
     <url>http://</url>
     <description>SCRM</description>
     <properties>