Merge remote-tracking branch 'origin/main' into main

edu-travel-remote/edu-travel-remote-country/src/main/java/edu/travel/dto/BaseCountryServeCurrencyDto.java

@@ -0,0 +1,109 @@
+package edu.travel.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import edu.travel.po.PagePO;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 服务国家表
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class BaseCountryServeCurrencyDto extends PagePO {
+    /**
+     * ID
+     */
+    private Long id;
+
+    /**
+     * 所属洲
+     */
+    private Long parentId;
+
+    /**
+     * 关联国家id
+     */
+    private Long countryId;
+
+    /**
+     * 服务费比率
+     */
+    private BigDecimal serviceChargeValue;
+
+    /**
+     * 结算显示方式 -0 CNY100 -1 ¥100 -2 100RMB
+     */
+    private Integer payViewWay;
+
+    /**
+     * 中文国家/洲名称
+     */
+    private String countryNameZh;
+
+    /**
+     * 英文国家/洲名称
+     */
+    private String countryNameEn;
+
+    /**
+     * 本地国家/洲名称
+     */
+    private String countryNameLocal;
+
+    /**
+     * 服务状态，默认0,-0未开通，-1开通
+     */
+    private Integer serveEnable;
+
+
+    /**
+     * 货币表id
+     */
+    private Long currencyId;
+    /**
+     * 创建时间
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+    /**
+     * 货币名称_en
+     */
+    @TableField(value = "currency_name_en")
+    private String currencyNameEn;
+
+    /**
+     * 货币名称_zh
+     */
+    @TableField(value = "currency_name_zh")
+    private String currencyNameZh;
+
+    /**
+     * 货币代码
+     */
+    @TableField(value = "currency_code")
+    private String currencyCode;
+
+    /**
+     * 货币符号
+     * */
+    @TableField(value = "currency_symbol")
+    private String currencySymbol;
+    /**
+     * 货币单位
+     * */
+    @TableField(value = "currency_unit")
+    private String currencyUnit;
+}

edu-travel-remote/edu-travel-remote-country/src/main/java/edu/travel/dto/ShopCurrencyDto.java

@@ -4,12 +4,15 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import edu.travel.entity.BaseEntity;
 import edu.travel.po.PagePO;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.Date;
+
 /**
  * 货币表
  */
@@ -58,4 +61,17 @@ public class ShopCurrencyDto extends PagePO {
      * */
     @TableField(value = "status")
     private String status;
+    /**
+     * 创建时间
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+
+    /**
+     * 更新时间
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
 }

edu-travel-remote/edu-travel-remote-country/src/main/java/edu/travel/entity/ShopCurrency.java

@@ -0,0 +1,60 @@
+package edu.travel.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 货币表
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName(value = "shop_currency")
+public class ShopCurrency extends BaseEntity {
+    /**
+     * ID
+     */
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 货币名称_en
+     */
+    @TableField(value = "currency_name_en")
+    private String currencyNameEn;
+
+    /**
+     * 货币名称_zh
+     */
+    @TableField(value = "currency_name_zh")
+    private String currencyNameZh;
+
+    /**
+     * 货币代码
+     */
+    @TableField(value = "currency_code")
+    private String currencyCode;
+
+    /**
+     * 货币符号
+     * */
+    @TableField(value = "currency_symbol")
+    private String currencySymbol;
+    /**
+     * 货币单位
+     * */
+    @TableField(value = "currency_unit")
+    private String currencyUnit;
+
+    /**
+     * 状态 -0启用  -1禁用
+     * */
+    @TableField(value = "status")
+    private String status;
+
+}

edu-travel-remote/edu-travel-remote-country/src/main/java/edu/travel/mapper/ShopCurrencyMapper.java

@@ -0,0 +1,7 @@
+package edu.travel.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import edu.travel.entity.ShopCurrency;
+
+public interface ShopCurrencyMapper extends BaseMapper<ShopCurrency> {
+}

edu-travel-remote/edu-travel-remote-country/src/main/java/edu/travel/remote/BaseCountryServeRemoteController.java

@@ -1,6 +1,5 @@
 package edu.travel.remote;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import edu.travel.dto.BaseCountryServeDto;
 import edu.travel.remote.base.RemoteBaseController;
 import edu.travel.rpc.RPCBaseResponse;
@@ -13,9 +12,6 @@ import java.util.List;
 
 @FeignClient(path = "/baseCountryServe",name = "commodity")
 public interface BaseCountryServeRemoteController extends RemoteBaseController<BaseCountryServeVo, BaseCountryServeDto> {
-    //分页
-    @GetMapping("/getCountryServePage")
-    public RPCBaseResponse<IPage<BaseCountryServeVo>> getCountryServePage(BaseCountryServeDto dto);
     //服务国家树
     @GetMapping("/getCountryServeTree")
     public RPCBaseResponse<List<BaseCountryServeVo>> getCountryServeTree();

edu-travel-remote/edu-travel-remote-country/src/main/java/edu/travel/vo/BaseCountryServeCurrencyVo.java

@@ -0,0 +1,111 @@
+package edu.travel.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import edu.travel.entity.BaseEntity;
+import edu.travel.po.PagePO;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 服务国家货币表
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class BaseCountryServeCurrencyVo extends BaseEntity {
+    /**
+     * ID
+     */
+    private Long id;
+
+    /**
+     * 所属洲
+     */
+    private Long parentId;
+
+    /**
+     * 关联国家id
+     */
+    private Long countryId;
+
+    /**
+     * 服务费比率
+     */
+    private BigDecimal serviceChargeValue;
+
+    /**
+     * 结算显示方式 -0 CNY100 -1 ¥100 -2 100RMB
+     */
+    private Integer payViewWay;
+
+    /**
+     * 中文国家/洲名称
+     */
+    private String countryNameZh;
+
+    /**
+     * 英文国家/洲名称
+     */
+    private String countryNameEn;
+
+    /**
+     * 本地国家/洲名称
+     */
+    private String countryNameLocal;
+
+    /**
+     * 服务状态，默认0,-0未开通，-1开通
+     */
+    private Integer serveEnable;
+
+
+    /**
+     * 货币表id
+     */
+    private Long currencyId;
+    /**
+     * 创建时间
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+    /**
+     * 货币名称_en
+     */
+    @TableField(value = "currency_name_en")
+    private String currencyNameEn;
+
+    /**
+     * 货币名称_zh
+     */
+    @TableField(value = "currency_name_zh")
+    private String currencyNameZh;
+
+    /**
+     * 货币代码
+     */
+    @TableField(value = "currency_code")
+    private String currencyCode;
+
+    /**
+     * 货币符号
+     * */
+    @TableField(value = "currency_symbol")
+    private String currencySymbol;
+    /**
+     * 货币单位
+     * */
+    @TableField(value = "currency_unit")
+    private String currencyUnit;
+
+}

edu-travel-remote/edu-travel-remote-country/src/main/java/edu/travel/vo/BaseCountryServeVo.java

@@ -1,6 +1,9 @@
 package edu.travel.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import edu.travel.annotation.LinkOne;
 import edu.travel.entity.BaseEntity;
+import edu.travel.mapper.ShopCurrencyMapper;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -8,6 +11,7 @@ import lombok.NoArgsConstructor;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 服务国家表
@@ -74,8 +78,15 @@ public class BaseCountryServeVo extends BaseEntity {
      * 区号
      */
     private String areaCode;
+
+    /**
+     *map
+     */
+    @TableField(exist = false)
+    @LinkOne(linkField = "currencyId", linkMapper = ShopCurrencyMapper.class, linkPrimaryField = "id")
+    private Map<String, Object> map;
     /**
      * 子类
      */
     private List<BaseCountryServeVo> children = new ArrayList<>();
-}
+}

edu-travel-service/edu-travel-service-country/src/main/java/edu/travel/country/entity/BaseCountryServe.java

@@ -6,7 +6,10 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.Map;
 
+import edu.travel.annotation.LinkOne;
+import edu.travel.country.mapper.ShopCurrencyMapper;
 import edu.travel.entity.BaseEntity;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -115,4 +118,8 @@ public class BaseCountryServe extends BaseEntity {
      */
     @TableField(value = "currency_id")
     private Long currencyId;
+
+    @TableField(exist = false)
+    @LinkOne(linkField = "currencyId", linkMapper = ShopCurrencyMapper.class, linkPrimaryField = "id")
+    private Map<String, Object> map;
 }

edu-travel-service/edu-travel-service-country/src/main/java/edu/travel/country/entity/ShopCurrency.java

@@ -5,11 +5,14 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 
+import edu.travel.annotation.LinkOne;
 import edu.travel.entity.BaseEntity;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.Map;
+
 /**
  * 货币表
  */
@@ -58,4 +61,5 @@ public class ShopCurrency extends BaseEntity {
      * */
     @TableField(value = "status")
     private String status;
+
 }

edu-travel-service/edu-travel-service-country/src/main/java/edu/travel/country/service/BaseCountryServeService.java

@@ -1,6 +1,5 @@
 package edu.travel.country.service;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import edu.travel.country.entity.BaseCountryServe;
 import edu.travel.dto.BaseCountryServeDto;
@@ -11,8 +10,9 @@ import java.util.List;
 
 public interface BaseCountryServeService extends IService<BaseCountryServe>{
 
-    //分页
-    RPCBaseResponse<IPage<BaseCountryServeVo>> getCountryServePage(BaseCountryServeDto dto);
+
 //服务国家树
     RPCBaseResponse<List<BaseCountryServeVo>> getCountryServeTree();
+//分页
+    RPCBaseResponse<List<BaseCountryServe>> getCountryServeCurrencyPageForm(BaseCountryServeDto dto);
 }

edu-travel-service/edu-travel-service-country/src/main/java/edu/travel/country/service/impl/BaseCountryServeServiceImpl.java

@@ -1,6 +1,5 @@
 package edu.travel.country.service.impl;
 
-import com.alibaba.nacos.client.naming.utils.CollectionUtils;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -9,6 +8,7 @@ import edu.travel.country.entity.BaseCountry;
 import edu.travel.country.entity.BaseCountryServe;
 import edu.travel.country.mapper.BaseCountryMapper;
 import edu.travel.country.mapper.BaseCountryServeMapper;
+import edu.travel.country.mapper.ShopCurrencyMapper;
 import edu.travel.country.service.BaseCountryServeService;
 import edu.travel.dto.BaseCountryServeDto;
 import edu.travel.rpc.RPCBaseResponse;
@@ -20,21 +20,24 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
-import java.util.stream.Collectors;
 
 @Service
 public class BaseCountryServeServiceImpl extends SysServiceImpl<BaseCountryServeMapper, BaseCountryServe> implements BaseCountryServeService {
     @Autowired
     private BaseCountryMapper baseCountryMapper;
-    //分页
-    @Override
-    public RPCBaseResponse<IPage<BaseCountryServeVo>> getCountryServePage(BaseCountryServeDto dto) {
-        Page<BaseCountryServe> baseCountryServePage = new Page<>(dto.getCurrentPage(), dto.getPageSize());
-        IPage<BaseCountryServe> pageLink = super.getPageLink(new LambdaQueryWrapper<BaseCountryServe>(), baseCountryServePage);
-        IPage<BaseCountryServeVo> result = new Page<>();
-        BeanUtils.copyProperties(pageLink, result);
-        return new RPCBaseResponse<>(200,"SUCCESS",result);
-    }
+    @Autowired
+    private ShopCurrencyMapper shopCurrencyMapper;
+
+//分页连表
+@Override
+public RPCBaseResponse<List<BaseCountryServe>> getCountryServeCurrencyPageForm(BaseCountryServeDto dto) {
+    // 查询所有国家服务数据
+    LambdaQueryWrapper<BaseCountryServe> queryWrapper = new LambdaQueryWrapper<>();
+    // 查询所有的数据
+    List<BaseCountryServe> baseCountryServeList = super.getListLink(queryWrapper);
+    return new RPCBaseResponse <>(200, "SUCCESS", baseCountryServeList);
+}
+
 
     /**
      * 服务国家树
@@ -46,7 +49,6 @@ public class BaseCountryServeServiceImpl extends SysServiceImpl<BaseCountryServe
         LambdaQueryWrapper<BaseCountryServe> queryWrapper = new LambdaQueryWrapper<>();
         List<BaseCountryServe> baseCountryServeList = super.getListLink(queryWrapper);
 
-
         // 构建树形结构
         List<BaseCountryServeVo> baseCountryServeTree = buildCountryServeTree(baseCountryServeList);
 
@@ -54,6 +56,8 @@ public class BaseCountryServeServiceImpl extends SysServiceImpl<BaseCountryServe
         return new RPCBaseResponse<>(200, "SUCCESS", baseCountryServeTree);
     }
 
+
+
     // 树构建方法
     private List<BaseCountryServeVo> buildCountryServeTree(List<BaseCountryServe> baseCountryServeList) {
         Map<Long, BaseCountryServeVo> serveMap = new HashMap<>();
@@ -103,5 +107,4 @@ public class BaseCountryServeServiceImpl extends SysServiceImpl<BaseCountryServe
 
         return rootCountries;
     }
-
 }

edu-travel-service/edu-travel-service-country/src/main/java/edu/travel/country/web/BaseCountryServeController.java

@@ -1,7 +1,6 @@
 package edu.travel.country.web;
 
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import edu.travel.country.entity.BaseCountryServe;
 import edu.travel.country.service.BaseCountryServeService;
 import edu.travel.dto.BaseCountryServeDto;
@@ -16,41 +15,40 @@ import org.springframework.web.bind.annotation.*;
 import java.util.List;
 
 /**
-* 服务国家表(base_country_serve)表控制层
-*
-* @author xxxxx
-*/
+ * 服务国家表(base_country_serve)表控制层
+ *
+ * @author xxxxx
+ */
 @RestController
 @RequestMapping("/baseCountryServe")
-public class BaseCountryServeController  extends BaseController<BaseCountryServe> implements BaseCountryServeRemoteController {
+public class BaseCountryServeController extends BaseController<BaseCountryServe> implements BaseCountryServeRemoteController {
 
     /**
      * 服务国家表(base_country_serve)表控制层
-     *
      */
-
     @Autowired
     private BaseCountryServeService baseCountryServeService;
 
     /**
-     * 分页
-     * @param dto
-     * @return
+     * 分页连表
      */
-    @GetMapping("/getCountryServePage")
-    public RPCBaseResponse<IPage<BaseCountryServeVo>> getCountryServePage(BaseCountryServeDto dto) {
-        return baseCountryServeService.getCountryServePage(dto);
+    @GetMapping("/getCountryServeCurrencyPageForm")
+    public RPCBaseResponse<List<BaseCountryServe>> getCountryServeCurrencyPageForm(BaseCountryServeDto dto) {
+        return baseCountryServeService.getCountryServeCurrencyPageForm(dto);
     }
-/**
- * 服务国家树
- */
+
+
+    /**
+     * 服务国家树
+     */
     @GetMapping("/getCountryServeTree")
- public RPCBaseResponse<List<BaseCountryServeVo>> getCountryServeTree(){
-        System.out.println("获取服务国家树");
+    public RPCBaseResponse<List<BaseCountryServeVo>> getCountryServeTree() {
         return baseCountryServeService.getCountryServeTree();
     }
+
     /**
      * 获取服务国家信息
+     *
      * @param id
      * @return
      */
@@ -65,6 +63,7 @@ public class BaseCountryServeController  extends BaseController<BaseCountryServe
 
     /**
      * 更新服务国家信息
+     *
      * @param entity
      * @return
      */
@@ -81,6 +80,7 @@ public class BaseCountryServeController  extends BaseController<BaseCountryServe
 
     /**
      * 新增服务国家信息
+     *
      * @param entity
      * @return
      */
@@ -97,12 +97,13 @@ public class BaseCountryServeController  extends BaseController<BaseCountryServe
 
     /**
      * 删除服务国家信息
+     *
      * @param ids
      * @return
      */
     @Override
     @PostMapping("/deleteCountryServeFormId")
-    public RPCBaseResponse<BaseCountryServeVo> deleteTargetFormId(@RequestBody  List<String> ids) {
+    public RPCBaseResponse<BaseCountryServeVo> deleteTargetFormId(@RequestBody List<String> ids) {
         RPCBaseResponse<BaseCountryServe> baseCountryServeRPCBaseResponse = super.deleteTargetById(ids);
         RPCBaseResponse<BaseCountryServeVo> baseCountryServeVoRPCBaseResponse = new RPCBaseResponse<>();
         BeanUtils.copyProperties(baseCountryServeRPCBaseResponse, baseCountryServeVoRPCBaseResponse);
@@ -111,6 +112,7 @@ public class BaseCountryServeController  extends BaseController<BaseCountryServe
 
     /**
      * 获取服务国家列表
+     *
      * @return
      */
     @Override

edu-travel-service/edu-travel-service-country/src/main/java/edu/travel/country/web/ShopCurrencyController.java

@@ -59,7 +59,7 @@ public class ShopCurrencyController extends BaseController<ShopCurrency> impleme
      */
     @Override
     @PostMapping("/updateCurrencyFormId")
-    public RPCBaseResponse<ShopCurrencyVo> updateTargetFormId(ShopCurrencyDto entity) {
+    public RPCBaseResponse<ShopCurrencyVo> updateTargetFormId(@RequestBody ShopCurrencyDto entity) {
         ShopCurrency shopCurrency = new ShopCurrency();
         BeanUtils.copyProperties(entity, shopCurrency);
         RPCBaseResponse<ShopCurrency> shopCurrencyRPCBaseResponse = super.updateTargetById(shopCurrency);
@@ -75,7 +75,7 @@ public class ShopCurrencyController extends BaseController<ShopCurrency> impleme
      */
     @Override
     @PostMapping("/saveCurrencyForm")
-    public RPCBaseResponse<ShopCurrencyVo> saveFormTarget(ShopCurrencyDto entity) {
+    public RPCBaseResponse<ShopCurrencyVo> saveFormTarget(@RequestBody ShopCurrencyDto entity) {
         ShopCurrency shopCurrency = new ShopCurrency();
         BeanUtils.copyProperties(entity, shopCurrency);
         RPCBaseResponse<ShopCurrency> shopCurrencyRPCBaseResponse = super.saveTarget(shopCurrency);
@@ -91,7 +91,7 @@ public class ShopCurrencyController extends BaseController<ShopCurrency> impleme
      */
     @Override
     @PostMapping("/deleteCurrencyFormId")
-    public RPCBaseResponse<ShopCurrencyVo> deleteTargetFormId(List<String> ids) {
+    public RPCBaseResponse<ShopCurrencyVo> deleteTargetFormId(@RequestBody List<String> ids) {
         RPCBaseResponse<ShopCurrency> shopCurrencyRPCBaseResponse = super.deleteTargetById(ids);
         RPCBaseResponse<ShopCurrencyVo> shopCurrencyVoRPCBaseResponse = new RPCBaseResponse<>();
         BeanUtils.copyProperties(shopCurrencyRPCBaseResponse, shopCurrencyVoRPCBaseResponse);

edu-travel-service/edu-travel-service-country/src/main/java/edu/travel/country/web/ShopLanguageController.java

@@ -12,7 +12,6 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 /**