feat:fix error file

src/main/java/com/aoyang/tms/config/MybatisPlusConfig.java

@@ -11,7 +11,7 @@ import org.springframework.context.annotation.Configuration;
  * @CreateDate: 2019/12/5 下午6:40
  */
 @Configuration
-@MapperScan("com.aoyang.strategy.mapper")
+@MapperScan("com.aoyang.tms.mapper")
 public class MybatisPlusConfig {
     /**
      * 分页插件,自动识别数据库类型

src/main/java/com/aoyang/tms/config/RabbitConfig.java

@@ -20,8 +20,8 @@ public class RabbitConfig {
     }
 
     @Bean
-    public Queue gasOrderStrategy() {
-        return new Queue("gasOrderStrategy", true);
+    public Queue gasOrdertms() {
+        return new Queue("gasOrdertms", true);
     }
 
     @Bean

src/main/java/com/aoyang/tms/controller/AppVersionController.java

@@ -14,7 +14,6 @@ import lombok.extern.slf4j.Slf4j;
 
 import javax.annotation.Resource;
 
-import com.aoyang.tms.service.AppVersionService;
 import com.aoyang.tms.entity.AppVersion;
 import com.aoyang.common.result.Result;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -34,53 +33,17 @@ import com.aoyang.common.param.PageParam;
 @RestController
 @Slf4j
 @Api(value = "app_versionCRUD接口")
-@RequestMapping("/strategy/app_version")
+@RequestMapping("/tms/app_version")
 public class AppVersionController {
 
-    @Resource
-    private AppVersionService appVersionService;
-
     @ApiOperation(value = "检查版本", notes = "获取最新一条版本信息，客户端进行对比，判断强制更新以及提示更新")
     @PostMapping("/check_version")
     public Result check(@RequestBody AppVersionParam appVersionParam) {
-        log.info("获取最新APP版本,/strategy/app_version/check_version，参数:{}", JSON.toJSONString(appVersionParam));
+        log.info("获取最新APP版本,/tms/app_version/check_version，参数:{}", JSON.toJSONString(appVersionParam));
         if (appVersionParam == null || appVersionParam.getOsType() == null) {
             return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
         }
-        AppVersion lasted = appVersionService.getLatestVersion(appVersionParam.getOsType());
-        return new Result<>(lasted);
-    }
-
-
-    @ApiOperation(value = "获取app_version列表", notes = "")
-    @PostMapping("/list")
-    public Result list(@RequestBody PageParam<AppVersion> pageParam) {
-        log.info("获取APP版本列表,/strategy/app_version/list，参数:{}", JSON.toJSONString(pageParam));
-        Page<AppVersion> page = new Page<>(pageParam.getPage(), pageParam.getSize());
-        IPage<AppVersion> records = appVersionService.page(page, Wrappers.query(pageParam.getParam()));
-        return new Result<>(records);
-    }
-
-    @ApiOperation(value = "修改app_version", notes = "根据id修改app_version")
-    @PostMapping("/update")
-    public Result update(@RequestBody AppVersion appVersion) {
-        log.info("更新app版本,/strategy/app_version/update，参数:{}", JSON.toJSONString(appVersion));
-        if (appVersion == null || appVersion.getId() == null) {
-            return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
-        }
-        Boolean flag = appVersionService.updateById(appVersion);
-        return new Result<>(flag);
-    }
-
-    @ApiOperation(value = "添加app_version", notes = "新增一条app_version")
-    @PostMapping("/add")
-    public Result add(@RequestBody AppVersion appVersion) {
-        log.info("添加app版本,/strategy/app_version/add，参数:{}", JSON.toJSONString(appVersion));
-        if (appVersion == null || appVersion.getOsType() == null || appVersion.getMinVersion() == null || StringUtils.isBlank(appVersion.getVersionName()) || StringUtils.isBlank(appVersion.getNote())) {
-            return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
-        }
-        Boolean flag = appVersionService.save(appVersion);
-        return new Result<>(flag);
+        return new Result<>(true);
     }
 
 }

src/main/java/com/aoyang/tms/controller/param/IdParam.java

@@ -0,0 +1,27 @@
+package com.aoyang.tms.controller.param;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * @author zhuangxl
+ * @description 通用id查询参数
+ * @since 2021-03-24 9:43
+ */
+@ApiModel(value = "通用id参数", description = "通用id参数")
+public class IdParam {
+
+    @ApiModelProperty(value = "通用id参数")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long id;
+
+    public Long getId() {
+        return id;
+    }
+
+    public IdParam setId(Long id) {
+        this.id = id;
+        return this;
+    }
+}

src/main/java/com/aoyang/tms/entity/RequestInfo.java

@@ -0,0 +1,26 @@
+package com.aoyang.tms.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author xumingrui
+ * @since 2021/4/28 9:46
+ * @comment <接收从geteway 传过来的header值>
+ */
+@Data
+public class RequestInfo {
+    @ApiModelProperty(value = "请求userid")
+    private String userId;
+    @ApiModelProperty(value = "请求username")
+    private String userName;
+    @ApiModelProperty(value = "请求ip")
+    private String fromIP;
+    @ApiModelProperty(value = "请求clientId")
+    private String clientId;
+    @ApiModelProperty(value = "请求roleId")
+    private String roleId;
+    @ApiModelProperty(value = "请求orgId")
+    private String orgId;
+
+}

src/main/java/com/aoyang/tms/entity/vo/TruckVO.java

@@ -114,10 +114,6 @@ public class TruckVO implements Serializable {
     @TableField(exist = false)
     private List<User> driverList;
 
-    @ApiModelProperty(value = "司机列表-新")
-    @TableField(exist = false)
-    private List<DriverListAll> driversList;
-
     @ApiModelProperty(value = "车辆账户余额")
     @TableField(exist = false)
     private BigDecimal balance;

src/main/java/com/aoyang/tms/feign/AccountFeign.java

@@ -1,111 +0,0 @@
-package com.aoyang.tms.feign;
-
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Map;
-
-import com.aoyang.tms.controller.param.IdParam;
-import com.aoyang.tms.controller.vo.CarrierBalanceVO;
-import com.aoyang.tms.feign.param.CarrierBalanceParam;
-import com.aoyang.tms.feign.param.findTruckBalancesParam;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestHeader;
-
-import com.aoyang.common.result.Result;
-import com.aoyang.tms.entity.feignEntity.OrgAccount;
-import com.aoyang.tms.entity.feignEntity.TransferOrder;
-import com.aoyang.tms.entity.feignEntity.TruckAccount;
-
-/**
- * @author: liujiren
- */
-
-@FeignClient(name = "account")
-public interface AccountFeign {
-
-
-    /**
-     * @return
-     * @Author guoyong
-     * @Description 批量获取卡车账户余额
-     * @Date 2021/4/15
-     * @Param
-     **/
-    @PostMapping("/account/truck_account/find_truck_balances")
-    Result<List<TruckAccount>> findTruckBalances(@RequestBody findTruckBalancesParam param);
-
-    /**
-     * 获取组织账户信息
-     *
-     * @param orgAccount 组织账户参数
-     * @return 账户详情或失败信息
-     */
-    @PostMapping(value = "/account/org_account/find_by_param")
-    Result<OrgAccount> findByParam(@RequestBody OrgAccount orgAccount);
-
-    /**
-     * 根据卡车truckId，查询卡车经销账户余额
-     */
-    @PostMapping(value = "/account/truck_account/get_balance_trade_type")
-    Result getBalance(@RequestBody Map<String, Object> map) throws Exception;
-
-    /**
-     * 根据卡车truckId，查询卡车直销账户余额
-     */
-    @PostMapping(value = "/account/directsales/truck_account/get_balance")
-    Result getDirectTruckBalance(@RequestBody Map<String, Object> map) throws Exception;
-
-
-    /**
-     * @Author guoyong
-     * @Description 添加经销户
-     * @Date  2022/2/11
-     * @Param
-     * @return
-    **/
-    @PostMapping("/account/truck_account/add")
-    Result add(@RequestHeader(value = "userId") Long userId, @RequestBody TruckAccount truckAccount);
-
-    /**
-     * @Author guoyong
-     * @Description 创建直销户
-     * @Date  2022/2/11
-     * @Param
-     * @return
-    **/
-    @PostMapping("/account/directsales/truck_account/add")
-    Result addDirectTruckAccount(@RequestHeader(value = "userId") Long userId, @RequestBody TruckAccount truckAccount);
-
-
-    @PostMapping("/account/account_balance/transfer_carrier")
-    Result transferCarrier(@RequestBody TransferOrder transferOrder);
-
-    @PostMapping("/account/truck_account/edit")
-    Result editTruckAccount(@RequestHeader(value = "userId") Long userId, @RequestBody TruckAccount truckAccount);
-
-    /**
-     * @description: 变更车辆账户的组织
-     * @author: zhuangxl
-     * @since: 2021/4/6 11:38
-     **/
-    @PostMapping("/account/truck_account/change_org")
-    Result<Boolean> changeTruckAccountOrg(@RequestBody TruckAccount truckAccount);
-
-    /**
-     * 根据物流公司id，查询物流公司账户余额
-     */
-    @PostMapping("/account/org_account/find_carrier_balance")
-    Result<CarrierBalanceVO> findCarrierBalance(@RequestBody CarrierBalanceParam param);
-
-    /**
-     * @description: 根据组织id查询组织资金账户余额
-     * @author: zhuangxl
-     * @since: 2021/8/14 14:25
-     * @param orgId: 组织id
-     * @return: com.aoyang.common.result.Result<java.math.BigDecimal>
-     **/
-    @PostMapping("/account/org_account/get_balance_by_org_id")
-    Result<BigDecimal> getOrgAccountBalanceByOrgId(@RequestBody IdParam orgId);
-}

src/main/java/com/aoyang/tms/feign/AllinpayFeign.java

@@ -1,26 +0,0 @@
-package com.aoyang.tms.feign;
-
-import com.aoyang.common.result.Result;
-import com.aoyang.tms.feign.fallback.AllinpayFeignFallBack;
-import com.aoyang.tms.feign.param.CashbackParam;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-
-/**
- * @author guoyong
- * @description
- * @since 2021-09-04 17:07
- */
-@FeignClient(name = "allinpay", fallback = AllinpayFeignFallBack.class)
-public interface AllinpayFeign {
-
-    /**
-     * @param cashbackParam: 返现订单和返现金额
-     * @description: 执行返现转账
-     * @author: zhuangxl
-     * @since: 2021/8/14 15:37
-     * @return: com.aoyang.common.result.Result
-     **/
-    @PostMapping("/allinpay/pay/cashback")
-    Result cashback(CashbackParam cashbackParam);
-}

src/main/java/com/aoyang/tms/feign/GasDataFeign.java

@@ -1,31 +0,0 @@
-package com.aoyang.tms.feign;
-
-import com.aoyang.common.result.Result;
-import com.aoyang.tms.entity.Gasstation;
-import com.aoyang.tms.feign.fallback.GasDataFeignFallBack;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import java.util.List;
-
-/**
- * @author: liujiren
- */
-
-@FeignClient(name = "gasdata", fallbackFactory = GasDataFeignFallBack.class)
-public interface GasDataFeign {
-
-    /**
-     * 根据区域ID获取加气站组织id列表
-     *
-     * @param
-     * @return
-     */
-    @PostMapping("/gasdata/gasstation/strategy/add")
-    Result strategyAdd(@RequestBody List<Gasstation> list);
-
-    @PostMapping("/gasdata/gasstation/combat")
-    Result combat(@RequestBody List<Gasstation> gasstations);
-
-}

src/main/java/com/aoyang/tms/feign/MessageFeign.java

@@ -2,7 +2,6 @@ package com.aoyang.tms.feign;
 
 import com.aoyang.common.result.Result;
 import com.aoyang.tms.entity.feignEntity.SmsSendLog;
-import com.aoyang.tms.feign.param.CashbackParam;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -24,14 +23,4 @@ public interface MessageFeign {
                          @RequestHeader(value = "orgId", required = false) String orgId,
                          @RequestHeader(value = "userId", required = false) String userId,
                          @RequestHeader(value = "clientId", required = false) String clientId);
-
-    /**
-     * @description: 发送返现完成的微信模板消息
-     * @author: zhuangxl
-     * @since: 2021/8/14 14:54
-     * @param cashbackMsgParam: 订单信息 和 返现金额
-     * @return: com.aoyang.common.result.Result<java.lang.String>
-     **/
-    @PostMapping("/message/wx_template_message/send_cashback_msg")
-    Result<String> sendCashbackMessage(@RequestBody CashbackParam cashbackMsgParam);
 }

src/main/java/com/aoyang/tms/feign/PayFeign.java

@@ -1,70 +0,0 @@
-package com.aoyang.tms.feign;
-
-import com.aoyang.common.result.Result;
-import com.aoyang.tms.controller.param.IdParam;
-import com.aoyang.tms.entity.vo.GctOrder;
-import com.aoyang.tms.feign.fallback.PayFeignFallBack;
-import com.aoyang.tms.feign.param.DriverGctOrderParam;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author zhuangxl
- * @description
- * @since 2021-03-20 14:07
- */
-@FeignClient(name = "pay", fallback = PayFeignFallBack.class)
-public interface PayFeign {
-
-    /**
-     * @description: 查询司机是否有待支付的订单
-     * @author: zhuangxl
-     * @since: 2021/4/8 12:45
-     * @param param: 司机id
-     * @return: com.aoyang.common.result.Result<java.lang.Boolean>
-     **/
-
-    @PostMapping("/pay/gas_order/driver_order_check")
-    Result<Boolean> driverOrderCheck(IdParam param);
-
-    /**
-     * @description: 查询车辆是否有待支付的订单
-     * @author: zhuangxl
-     * @since: 2021/4/9 15:04
-     * @param param: 车辆id
-     * @return: com.aoyang.common.result.Result<java.lang.Boolean>
-     **/
-    @PostMapping("/pay/gas_order/truck_order_check")
-    Result<Boolean> truckOrderCheck(IdParam param);
-
-    /**
-     * 根据卡车id，查询卡车账户余额
-     */
-    @PostMapping(value = "/account/truck_account/get_balance")
-    Result getBalance(@RequestBody Map<String, Object> map);
-
-    /**
-     * @description: 根据司机id查询当前司机是否首次下单支付完成
-     * @author: zhuangxl
-     * @since: 2021/8/14 12:00
-     * @param driverId: 司机id
-     * @return: com.aoyang.common.result.Result<java.lang.Boolean>
-     **/
-    @PostMapping("/pay/gas_order/first_finished_order_check")
-    Result<Boolean> firstFinishedOrderCheckByDriverId(IdParam driverId);
-
-    /**
-     * @description: 查询司机在指定的加气站中（多个）预约的订单列表
-     * @author: zhuangxl
-     * @since: 2021/10/16 12:58
-     * @param param: 
-     * @return: com.aoyang.common.result.Result<java.util.List<com.aoyang.strategy.entity.vo.GctOrder>>
-     **/
-    @PostMapping("/pay/gct_order/get_driver_appointed_order")
-    Result<List<GctOrder>> getDriverAppointedGctOrders(@RequestBody DriverGctOrderParam param);
-
-}

src/main/java/com/aoyang/tms/feign/SettleFeign.java

@@ -1,51 +0,0 @@
-package com.aoyang.tms.feign;
-
-import com.aoyang.common.result.Result;
-import com.aoyang.tms.controller.vo.GasstationWeekAverageQtyVO;
-import com.aoyang.tms.feign.param.GasstationWeekAverageQty;
-import com.aoyang.tms.feign.param.StatisticsGasstationParam;
-import com.aoyang.tms.feign.result.GasstationTradeSum;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import java.math.BigDecimal;
-
-/**
- * @author: liujiren
- */
-
-@FeignClient(name = "settle")
-public interface SettleFeign {
-
-    /**
-     * @return
-     * @Author chengang
-     * @Description 根据加气站id和日期获取加气站库存日汇总数据
-     * @Date 2021/3/12
-     * @Param
-     **/
-    @PostMapping("/settle/statistics_gasstation_store/get_day_gasstation_stock")
-    Result<GasstationTradeSum> getDayGasstationStock(@RequestBody StatisticsGasstationParam param);
-
-    /**
-     * 加气站近7日日均销量
-     *
-     * @param
-     * @return
-     */
-    @PostMapping("/settle/statistics_gasstation_gasorder/gas_station_week_avg_qty")
-    Result<BigDecimal> gasStationWeekAvgQty(@RequestBody StatisticsGasstationParam param);
-
-
-    /**
-     * 加气站近7日日均销量
-     *
-     * @param
-     * @return
-     */
-    @PostMapping("/settle/gasstation_week_average_qty/find")
-    Result<GasstationWeekAverageQtyVO> find(@RequestBody GasstationWeekAverageQty param);
-
-
-}

src/main/java/com/aoyang/tms/feign/UserFeign.java

@@ -9,7 +9,6 @@ import com.aoyang.tms.entity.feignEntity.User;
 import com.aoyang.tms.entity.feignEntity.UserRole;
 import com.aoyang.tms.entity.feignEntity.WrapperUser;
 import com.aoyang.tms.feign.param.AuthLog;
-import com.aoyang.tms.feign.param.DistrictOrgIdsParam;
 import com.aoyang.tms.feign.result.DriverApply;
 import com.aoyang.tms.feign.result.DriverWhiteList;
 import com.aoyang.tms.feign.result.GasstationCardVO;
@@ -27,15 +26,6 @@ import java.util.List;
 public interface UserFeign {
 
     /**
-     * 根据区域ID获取加气站组织id列表
-     *
-     * @param
-     * @return
-     */
-    @PostMapping("/user/district_gasstation/get_org_ids")
-    Result<List<Long>> getOrgIds(@RequestBody DistrictOrgIdsParam districtOrgIdsParam);
-
-    /**
      * 添加加气站同时，创建加气站默认收银员
      * @param c_userId
      * @param user

src/main/java/com/aoyang/tms/feign/fallback/AccountFeignFallBack.java

@@ -1,122 +0,0 @@
-package com.aoyang.tms.feign.fallback;
-
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Map;
-
-import com.aoyang.tms.controller.param.IdParam;
-import com.aoyang.tms.controller.vo.CarrierBalanceVO;
-import com.aoyang.tms.feign.param.CarrierBalanceParam;
-import com.aoyang.tms.feign.param.findTruckBalancesParam;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.stereotype.Component;
-
-import com.aoyang.common.result.Result;
-import com.aoyang.tms.entity.feignEntity.OrgAccount;
-import com.aoyang.tms.entity.feignEntity.TransferOrder;
-import com.aoyang.tms.entity.feignEntity.TruckAccount;
-import com.aoyang.tms.feign.AccountFeign;
-import com.aoyang.tms.util.ErrCodeEnum;
-
-import feign.hystrix.FallbackFactory;
-import lombok.extern.slf4j.Slf4j;
-
-/**
- * @author liujiren
- */
-@Component
-@Slf4j
-public class AccountFeignFallBack implements FallbackFactory<AccountFeign> {
-    @Override
-    public AccountFeign create(Throwable cause) {
-        String msg = cause == null ? "" : cause.getMessage();
-        if (!StringUtils.isEmpty(msg)) {
-            log.error("AccountFeign error : {}", msg);
-        }
-        return new AccountFeign() {
-
-            @Override
-            public Result getBalance(Map<String, Object> map) {
-                return new Result(ErrCodeEnum.ACCOUNTSERVER_ERROR.getCode(),
-                        ErrCodeEnum.ACCOUNTSERVER_ERROR.getMessage());
-            }
-
-            @Override
-            public Result getDirectTruckBalance(Map<String, Object> map) throws Exception {
-                return new Result(ErrCodeEnum.ACCOUNTSERVER_ERROR.getCode(),
-                        ErrCodeEnum.ACCOUNTSERVER_ERROR.getMessage());
-            }
-
-            @Override
-            public Result add(Long userId, TruckAccount truckAccount) {
-                return new Result(ErrCodeEnum.ACCOUNTSERVER_ERROR.getCode(),
-                        ErrCodeEnum.ACCOUNTSERVER_ERROR.getMessage());
-            }
-
-            @Override
-            public Result addDirectTruckAccount(Long userId, TruckAccount truckAccount) {
-                return new Result(ErrCodeEnum.ACCOUNTSERVER_ERROR.getCode(),
-                        ErrCodeEnum.ACCOUNTSERVER_ERROR.getMessage());
-            }
-
-            @Override
-            public Result transferCarrier(TransferOrder transferOrder) {
-                return new Result(ErrCodeEnum.ACCOUNTSERVER_ERROR.getCode(),
-                        ErrCodeEnum.ACCOUNTSERVER_ERROR.getMessage());
-            }
-
-            @Override
-            public Result editTruckAccount(Long userId, TruckAccount truckAccount) {
-                return new Result(ErrCodeEnum.ACCOUNTSERVER_ERROR.getCode(),
-                        ErrCodeEnum.ACCOUNTSERVER_ERROR.getMessage());
-            }
-
-            /**
-             * @param truckAccount
-             * @description: 变更车辆账户的组织
-             * @author: zhuangxl
-             * @since: 2021/4/6 11:38
-             */
-            @Override
-            public Result<Boolean> changeTruckAccountOrg(TruckAccount truckAccount) {
-                log.error("策略中心微服务：feign调用账户中心微服务修改车辆账户的组织，进入熔断");
-                return new Result(ErrCodeEnum.ACCOUNTSERVER_ERROR.getCode(),
-                        ErrCodeEnum.ACCOUNTSERVER_ERROR.getMessage());
-            }
-
-            @Override
-            public Result<CarrierBalanceVO> findCarrierBalance(CarrierBalanceParam param) {
-                log.error("策略中心微服务：feign调用账户中心微服务查询物流公司余额，进入熔断");
-                return new Result(ErrCodeEnum.ACCOUNTSERVER_ERROR.getCode(),
-                        ErrCodeEnum.ACCOUNTSERVER_ERROR.getMessage());
-            }
-
-            /**
-             * @param orgId : 组织id
-             * @description: 根据组织id查询组织资金账户余额
-             * @author: zhuangxl
-             * @since: 2021/8/14 14:25
-             * @return: com.aoyang.common.result.Result<java.math.BigDecimal>
-             **/
-            @Override
-            public Result<BigDecimal> getOrgAccountBalanceByOrgId(IdParam orgId) {
-                log.error("策略中心微服务：根据组织id查询组织资金账户余额，进入熔断");
-                return new Result(ErrCodeEnum.ACCOUNTSERVER_ERROR.getCode(),
-                        ErrCodeEnum.ACCOUNTSERVER_ERROR.getMessage());
-            }
-
-            @Override
-            public Result<List<TruckAccount>> findTruckBalances(findTruckBalancesParam param) {
-                return new Result(ErrCodeEnum.ACCOUNTSERVER_ERROR.getCode(),
-                        ErrCodeEnum.ACCOUNTSERVER_ERROR.getMessage());
-            }
-
-            @Override
-            public Result findByParam(OrgAccount orgAccount) {
-                return new Result(ErrCodeEnum.ACCOUNTSERVER_ERROR.getCode(),
-                        ErrCodeEnum.ACCOUNTSERVER_ERROR.getMessage());
-            }
-        };
-    }
-
-}

src/main/java/com/aoyang/tms/feign/fallback/AllinpayFeignFallBack.java

@@ -1,31 +0,0 @@
-package com.aoyang.tms.feign.fallback;
-
-import com.aoyang.common.result.Result;
-import com.aoyang.tms.common.ResultStatus;
-import com.aoyang.tms.feign.AllinpayFeign;
-import com.aoyang.tms.feign.param.CashbackParam;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-/**
- * @author zhuangxl
- * @description
- * @since 2021-03-20 14:09
- */
-@Component
-@Slf4j
-public class AllinpayFeignFallBack implements AllinpayFeign {
-
-    /**
-     * @param cashbackParam : 返现订单和返现金额
-     * @description: 执行返现转账
-     * @author: zhuangxl
-     * @since: 2021/8/14 15:37
-     * @return: com.aoyang.common.result.Result<java.lang.String>
-     **/
-    @Override
-    public Result cashback(CashbackParam cashbackParam) {
-        log.error("allinpay中心微服务：执行返现转账，进入熔断");
-        return new Result<>(ResultStatus.FALL_BACK_ERROR.getCode(), "allinpay熔断", null);
-    }
-}

src/main/java/com/aoyang/tms/feign/fallback/GasDataFeignFallBack.java

@@ -1,43 +0,0 @@
-package com.aoyang.tms.feign.fallback;
-
-import com.aoyang.common.result.Result;
-import com.aoyang.tms.entity.Gasstation;
-import com.aoyang.tms.feign.GasDataFeign;
-import feign.hystrix.FallbackFactory;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.stereotype.Component;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author liujiren
- */
-@Component
-@Slf4j
-public class GasDataFeignFallBack implements FallbackFactory<GasDataFeign> {
-
-    @Override
-    public GasDataFeign create(Throwable cause) {
-        String msg = cause == null ? "" : cause.getMessage();
-        if (!StringUtils.isEmpty(msg)) {
-            log.error("AccountFeign error : {}", msg);
-        }
-        return new GasDataFeign() {
-
-            @Override
-            public Result strategyAdd(List<Gasstation> list) {
-                return new Result(new ArrayList<Gasstation>());
-            }
-
-            @Override
-            public Result combat(List<Gasstation> gasstations) {
-                return null;
-            }
-        };
-
-    }
-
-
-}

src/main/java/com/aoyang/tms/feign/fallback/MessageFeignFallBack.java

@@ -3,7 +3,6 @@ package com.aoyang.tms.feign.fallback;
 import com.aoyang.common.result.Result;
 import com.aoyang.tms.entity.feignEntity.SmsSendLog;
 import com.aoyang.tms.feign.MessageFeign;
-import com.aoyang.tms.feign.param.CashbackParam;
 import com.aoyang.tms.util.ErrCodeEnum;
 import feign.hystrix.FallbackFactory;
 import lombok.extern.slf4j.Slf4j;
@@ -30,21 +29,6 @@ public class MessageFeignFallBack implements FallbackFactory<MessageFeign> {
                         ErrCodeEnum.MESSAGESERVER_ERROR.getMessage());
 
             }
-
-            /**
-             * @param cashbackMsgParam : 订单信息 和 返现金额
-             * @description: 发送返现完成的微信模板消息
-             * @author: zhuangxl
-             * @since: 2021/8/14 14:54
-             * @return: com.aoyang.common.result.Result<java.lang.String>
-             **/
-            @Override
-            public Result<String> sendCashbackMessage(CashbackParam cashbackMsgParam) {
-                log.error("feign:/message/wx_template_message/send_cashback_msg，熔断");
-                return new Result(ErrCodeEnum.MESSAGESERVER_ERROR.getCode(),
-                        ErrCodeEnum.MESSAGESERVER_ERROR.getMessage());
-
-            }
         };
     }
 }

src/main/java/com/aoyang/tms/feign/fallback/PayFeignFallBack.java

@@ -1,87 +0,0 @@
-package com.aoyang.tms.feign.fallback;
-
-import com.aoyang.common.result.Result;
-import com.aoyang.tms.controller.param.IdParam;
-import com.aoyang.tms.entity.vo.GctOrder;
-import com.aoyang.tms.feign.PayFeign;
-import com.aoyang.tms.common.ResultStatus;
-import com.aoyang.tms.feign.param.DriverGctOrderParam;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author zhuangxl
- * @description
- * @since 2021-03-20 14:09
- */
-@Component
-@Slf4j
-public class PayFeignFallBack implements PayFeign {
-
-
-    /**
-     * @param param : 司机id
-     * @description: 查询司机是否有待支付的订单
-     * @author: zhuangxl
-     * @since: 2021/4/8 12:45
-     * @return: com.aoyang.common.result.Result<java.lang.Boolean>
-     **/
-    @Override
-    public Result<Boolean> driverOrderCheck(IdParam param) {
-        log.error("策略中心微服务：调用支付中心微服务查询司机是否有未支付的订单，进入熔断");
-        return new Result<>(ResultStatus.FALL_BACK_ERROR.getCode(), ResultStatus.FALL_BACK_ERROR.getMessage(), false);
-    }
-
-    /**
-     * @param param : 车辆id
-     * @description: 查询车辆是否有待支付的订单
-     * @author: zhuangxl
-     * @since: 2021/4/9 15:04
-     * @return: com.aoyang.common.result.Result<java.lang.Boolean>
-     **/
-    @Override
-    public Result<Boolean> truckOrderCheck(IdParam param) {
-        log.error("策略中心微服务：调用支付中心微服务查询车辆是否有未支付的订单，进入熔断");
-        return new Result<>(ResultStatus.FALL_BACK_ERROR.getCode(), ResultStatus.FALL_BACK_ERROR.getMessage(), false);
-    }
-
-    /**
-     * 根据卡车id，查询卡车账户余额
-     *
-     * @param map
-     */
-    @Override
-    public Result getBalance(Map<String, Object> map) {
-        log.error("策略中心微服务：根据卡车id，查询卡车账户余额，进入熔断");
-        return new Result<>(ResultStatus.FALL_BACK_ERROR.getCode(), ResultStatus.FALL_BACK_ERROR.getMessage(), false);
-    }
-
-    /**
-     * @param driverId : 司机id
-     * @description: 根据司机id查询当前司机是否首次下单支付完成
-     * @author: zhuangxl
-     * @since: 2021/8/14 12:00
-     * @return: com.aoyang.common.result.Result<java.lang.Boolean>
-     **/
-    @Override
-    public Result<Boolean> firstFinishedOrderCheckByDriverId(IdParam driverId) {
-        log.error("策略中心微服务：根据司机id查询当前司机是否首次下单支付完成，进入熔断");
-        return new Result<>(ResultStatus.FALL_BACK_ERROR.getCode(), ResultStatus.FALL_BACK_ERROR.getMessage(), false);
-    }
-
-    /**
-     * @param param :
-     * @description: 查询司机在指定的加气站中（多个）预约的订单列表
-     * @author: zhuangxl
-     * @since: 2021/10/16 12:58
-     * @return: com.aoyang.common.result.Result<java.util.List < com.aoyang.strategy.entity.vo.GctOrder>>
-     **/
-    @Override
-    public Result<List<GctOrder>> getDriverAppointedGctOrders(DriverGctOrderParam param) {
-        log.error("策略中心微服务：查询司机在指定的加气站中（多个）预约的订单列表，进入熔断");
-        return new Result<>(ResultStatus.FALL_BACK_ERROR.getCode(), ResultStatus.FALL_BACK_ERROR.getMessage(), null);
-    }
-}

src/main/java/com/aoyang/tms/feign/fallback/SettleFeignFallBack.java

@@ -1,53 +0,0 @@
-package com.aoyang.tms.feign.fallback;
-
-import com.aoyang.common.result.Result;
-import com.aoyang.tms.controller.vo.GasstationWeekAverageQtyVO;
-import com.aoyang.tms.feign.SettleFeign;
-import com.aoyang.tms.feign.param.GasstationWeekAverageQty;
-import com.aoyang.tms.feign.param.StatisticsGasstationParam;
-import com.aoyang.tms.feign.result.GasstationTradeSum;
-import com.aoyang.tms.util.ErrCodeEnum;
-import feign.hystrix.FallbackFactory;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.stereotype.Component;
-
-import java.math.BigDecimal;
-
-/**
- * @author liujiren
- */
-@Component
-@Slf4j
-public class SettleFeignFallBack implements FallbackFactory<SettleFeign> {
-
-    @Override
-    public SettleFeign create(Throwable cause) {
-        String msg = cause == null ? "" : cause.getMessage();
-        if (!StringUtils.isEmpty(msg)) {
-            log.error("AccountFeign error : {}", msg);
-        }
-        return new SettleFeign() {
-
-            @Override
-            public Result<GasstationTradeSum> getDayGasstationStock(StatisticsGasstationParam param) {
-                return new Result<>(ErrCodeEnum.SETTLESERVER_ERROR.getCode(), ErrCodeEnum.SETTLESERVER_ERROR.getMessage(), null);
-            }
-
-            @Override
-            public Result<BigDecimal> gasStationWeekAvgQty(StatisticsGasstationParam param) {
-                return new Result<>(ErrCodeEnum.SETTLESERVER_ERROR.getCode(), ErrCodeEnum.SETTLESERVER_ERROR.getMessage(), null);
-            }
-
-            @Override
-            public Result<GasstationWeekAverageQtyVO> find(GasstationWeekAverageQty param) {
-                return new Result<>(ErrCodeEnum.SETTLESERVER_ERROR.getCode(), ErrCodeEnum.SETTLESERVER_ERROR.getMessage(), null);
-            }
-
-        };
-
-    }
-
-
-
-}

src/main/java/com/aoyang/tms/feign/fallback/UserFeignFallBack.java

@@ -10,7 +10,6 @@ import com.aoyang.tms.entity.feignEntity.UserRole;
 import com.aoyang.tms.entity.feignEntity.WrapperUser;
 import com.aoyang.tms.feign.UserFeign;
 import com.aoyang.tms.feign.param.AuthLog;
-import com.aoyang.tms.feign.param.DistrictOrgIdsParam;
 import com.aoyang.tms.feign.result.DriverApply;
 import com.aoyang.tms.feign.result.DriverWhiteList;
 import com.aoyang.tms.feign.result.GasstationCardVO;
@@ -41,11 +40,6 @@ public class UserFeignFallBack implements FallbackFactory<UserFeign> {
         return new UserFeign() {
 
             @Override
-            public Result<List<Long>> getOrgIds(DistrictOrgIdsParam districtOrgIdsParam) {
-                return new Result<>(ErrCodeEnum.USERSERVER_ERROR.getCode(), ErrCodeEnum.USERSERVER_ERROR.getMessage(), null);
-            }
-
-            @Override
             public Result<User> addDefaultCashier(String c_userId, User user) {
                 return new Result(ErrCodeEnum.USER_SERVER_ERROR.getCode(), ErrCodeEnum.USER_SERVER_ERROR.getMessage());
             }

src/main/java/com/aoyang/tms/feign/param/CarrierBalanceParam.java

@@ -1,16 +0,0 @@
-package com.aoyang.tms.feign.param;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @Description: 物流公司余额参数类
- * @Author guoyong
- * @Date 2021/5/17 10:41
- * @Version 1.0
- */
-@Data
-public class CarrierBalanceParam {
-    @ApiModelProperty(value = "组织id")
-    private Long orgId;
-}

src/main/java/com/aoyang/tms/feign/param/CashbackParam.java

@@ -1,24 +0,0 @@
-package com.aoyang.tms.feign.param;
-
-import com.aoyang.tms.entity.vo.GasOrderVo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-/**
- * @author zhuangxl
- * @description
- * @since 2021-08-14 14:57
- */
-@ApiModel(value = "返现微信模板消息参数")
-@Data
-public class CashbackParam {
-
-    @ApiModelProperty(value = "已完成支付和返现的加气订单信息")
-    private GasOrderVo gasOrder;
-
-    @ApiModelProperty(value = "返现金额")
-    private BigDecimal amount;
-}

src/main/java/com/aoyang/tms/feign/param/DistrictOrgIdsParam.java

@@ -1,23 +0,0 @@
-package com.aoyang.tms.feign.param;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @Description: 根据区域id获取加气站id参数类
- * @Author guoyong
- * @Date 2021/3/1 11:42
- * @Version 1.0
- */
-@Data
-public class DistrictOrgIdsParam {
-
-    @ApiModelProperty(value = "区域id")
-    private  Integer districtId;
-
-    @ApiModelProperty(value = "日期")
-    private  String date;
-
-    @ApiModelProperty(value = "加气站状态,状态（0：启用 1：停用）")
-    private  Integer status;
-}

src/main/java/com/aoyang/tms/feign/param/DriverGctOrderParam.java

@@ -1,29 +0,0 @@
-package com.aoyang.tms.feign.param;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * @author zhuangxl
- * @description
- * @since 2021-10-16 9:33
- */
-@ApiModel("司机预约检测订单查询参数")
-@Data
-public class DriverGctOrderParam {
-
-    @ApiModelProperty(value = "预约日期")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private String appointDate;
-
-    @ApiModelProperty(value = "加气站ids")
-    private List<Long> idList;
-
-    @ApiModelProperty(value = "司机id")
-    private Long driverId;
-
-}

src/main/java/com/aoyang/tms/feign/param/GasstationWeekAverageQty.java

@@ -1,47 +0,0 @@
-package com.aoyang.tms.feign.param;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.time.LocalDate;
-
-/**
- * <p>
-    * 加气站近7日日均销量落地表，定时任务每天落地一次
-    * </p>
- *
- * @author liujiren
- * @since 2021-07-12
- */
-@Data
-public class GasstationWeekAverageQty implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "id主键")
-    private Integer id;
-
-    @ApiModelProperty(value = "加气站id")
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long gasstationId;
-
-    @ApiModelProperty(value = "加气站简称")
-    private String nickName;
-
-    @ApiModelProperty(value = "加气站名称")
-    private String gasstationName;
-
-    @ApiModelProperty(value = "近7日日均销量")
-    private BigDecimal weekAverageQty;
-
-    @ApiModelProperty(value = "存量(站端当日期初库存数+当日配送量[期望到站时间为当日的LNG计划订单])")
-    private BigDecimal stock;
-
-    @ApiModelProperty(value = "年月日，格式如yyyy-mm-dd")
-    private LocalDate curDate;
-
-
-}

src/main/java/com/aoyang/tms/feign/param/StatisticsGasstationParam.java

@@ -1,18 +0,0 @@
-package com.aoyang.tms.feign.param;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @Description: ${DESCRIPTION}
- * @Author guoyong
- * @Date 2021/2/25 17:16
- * @Version 1.0
- */
-@Data
-public class StatisticsGasstationParam {
-    @ApiModelProperty(value = "加气站ID")
-    private Long gasstationId;
-    @ApiModelProperty(value = "日期")
-    private String date;
-}

src/main/java/com/aoyang/tms/feign/param/findTruckBalancesParam.java

@@ -1,19 +0,0 @@
-package com.aoyang.tms.feign.param;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * @Description: 批量查询账户余额
- * @Author guoyong
- * @Date 2021/4/14 17:06
- * @Version 1.0
- */
-@Data
-public class findTruckBalancesParam {
-
-    @ApiModelProperty(value = "卡车ids")
-    private List<Long> truckIds;
-}

src/main/profiles/dev/bootstrap.yml

@@ -10,7 +10,7 @@ spring:
   application:
     name: tms
   datasource:
-    url: jdbc:mysql://172.31.58.45:3306/strategy?characterEncoding=utf8&serverTimezone=Asia/Shanghai&connectTimeout=6000&socketTimeout=6000&autoReconnect=true
+    url: jdbc:mysql://172.31.58.45:3306/tms?characterEncoding=utf8&serverTimezone=Asia/Shanghai&connectTimeout=6000&socketTimeout=6000&autoReconnect=true
   cloud:
     nacos:
       server-addr: ${nacos.server-addr}

src/main/profiles/local/bootstrap.yml

@@ -8,10 +8,10 @@ nacos:
   group: local
 spring:
   application:
-    name: strategy
+    name: tms
   datasource:
     type: com.mysql.cj.jdbc.MysqlDataSource
-    url: jdbc:mysql://dev.auyen.com:3306/strategy?characterEncoding=utf8&serverTimezone=Asia/Shanghai&connectTimeout=1000&socketTimeout=3000&autoReconnect=true
+    url: jdbc:mysql://dev.auyen.com:3306/tms?characterEncoding=utf8&serverTimezone=Asia/Shanghai&connectTimeout=1000&socketTimeout=3000&autoReconnect=true
     username: zhuangxueli
     password: zhuangxueli123
   cloud:

src/main/profiles/prod/bootstrap.yml

@@ -8,9 +8,9 @@ nacos:
   group: prod
 spring:
   application:
-    name: strategy
+    name: tms
   datasource:
-    url: jdbc:mysql://172.31.58.52:3306/strategy?characterEncoding=utf8&serverTimezone=Asia/Shanghai&connectTimeout=6000&socketTimeout=6000&autoReconnect=true
+    url: jdbc:mysql://172.31.58.52:3306/tms?characterEncoding=utf8&serverTimezone=Asia/Shanghai&connectTimeout=6000&socketTimeout=6000&autoReconnect=true
   cloud:
     nacos:
       server-addr: ${nacos.server-addr}

src/main/profiles/test/bootstrap.yml

@@ -8,9 +8,9 @@ nacos:
   group: test
 spring:
   application:
-    name: strategy
+    name: tms
   datasource:
-    url: jdbc:mysql://172.31.58.46:3306/strategy?characterEncoding=utf8&serverTimezone=Asia/Shanghai&connectTimeout=6000&socketTimeout=6000&autoReconnect=true
+    url: jdbc:mysql://172.31.58.46:3306/tms?characterEncoding=utf8&serverTimezone=Asia/Shanghai&connectTimeout=6000&socketTimeout=6000&autoReconnect=true
   cloud:
     nacos:
       server-addr: ${nacos.server-addr}

src/main/resources/application.yml

@@ -2,7 +2,7 @@ mybatis-plus:
   # 如果是放在resource目录 classpath:/mapper/*Mapper.xml
   mapper-locations: classpath:/mapper/*Mapper.xml
   #实体扫描，多个package用逗号或者分号分隔
-  typeAliasesPackage: com.aoyang.strategy.entity
+  typeAliasesPackage: com.aoyang.tms.entity
   global-config:
     db-config:
       #主键类型  AUTO:"数据库ID自增", INPUT:"用户输入ID",ID_WORKER:"全局唯一ID (数字类型唯一ID)", UUID:"全局唯一ID UUID";