Merge remote-tracking branch 'origin/main'

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

@@ -0,0 +1,61 @@
+package edu.travel.dto;
+
+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 edu.travel.entity.BaseEntity;
+import edu.travel.po.PagePO;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 货币表
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName(value = "shop_currency")
+public class ShopCurrencyDto extends PagePO {
+    /**
+     * 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/remote/BaseCountryServeRemoteController.java

@@ -1,11 +1,37 @@
 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;
 import edu.travel.vo.BaseCountryServeVo;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+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();
+    //获取服务国家信息
+    @GetMapping("/getCountryServeFormId")
+    public RPCBaseResponse<BaseCountryServeVo> getFormId(String id);
+    //更新服务国家信息
+    @GetMapping("/updateCountryServeFormId")
+    public RPCBaseResponse<BaseCountryServeVo> updateTargetFormId(@RequestBody BaseCountryServeDto entity);
+    //新增服务国家信息
+    @GetMapping("/saveCountryServeForm")
+    public RPCBaseResponse<BaseCountryServeVo> saveFormTarget(@RequestBody BaseCountryServeDto entity);
+    //删除服务国家信息
+    @GetMapping("/deleteCountryServeFormId")
+    public RPCBaseResponse<BaseCountryServeVo> deleteTargetFormId(@RequestBody List<String> ids);
+    //获取服务国家列表
+    @GetMapping("/listForm")
+    public RPCBaseResponse<List<BaseCountryServeVo>> getAllForm();
 }

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

@@ -0,0 +1,28 @@
+package edu.travel.remote;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import edu.travel.dto.ShopCurrencyDto;
+import edu.travel.remote.base.RemoteBaseController;
+import edu.travel.rpc.RPCBaseResponse;
+import edu.travel.vo.ShopCurrencyVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+
+import java.util.List;
+
+@FeignClient(path = "/shopCurrency",name = "commodity")
+public interface ShopCurrencyRemoteController extends RemoteBaseController<ShopCurrencyVo, ShopCurrencyDto> {
+    @GetMapping("/getCurrencyPage")
+    public RPCBaseResponse<IPage<ShopCurrencyVo>> getCurrencyPage(ShopCurrencyDto dto);
+    @GetMapping("/getCurrencyFormId")
+    public RPCBaseResponse<ShopCurrencyVo> getFormId(String id);
+    @PostMapping("/updateCurrencyFormId")
+    public RPCBaseResponse<ShopCurrencyVo> updateTargetFormId(ShopCurrencyDto entity);
+    @PostMapping("/saveCurrencyForm")
+    public RPCBaseResponse<ShopCurrencyVo> saveFormTarget(ShopCurrencyDto entity);
+    @PostMapping("/deleteCurrencyFormId")
+    public RPCBaseResponse<ShopCurrencyVo> deleteTargetFormId(List<String> ids);
+    @GetMapping("/listCurrencyForm")
+    public RPCBaseResponse<List<ShopCurrencyVo>> getAllForm();
+}

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

@@ -0,0 +1,60 @@
+package edu.travel.vo;
+
+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 edu.travel.entity.BaseEntity;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 货币表
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName(value = "shop_currency")
+public class ShopCurrencyVo 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-service/edu-travel-service-commodity/src/main/java/edu/travel/commodity/constant/RedisKey.java

@@ -9,4 +9,8 @@ public interface RedisKey {
    String PRODUCT_HOT_TYPE = BASH +"product:hot:type";
     /**热门二级商品类型*/
    String PRODUCT_TO_HOT_TYPE = BASH +"product:to:hot:type";
+    /**
+     * 加上国家
+     */
+
 }

edu-travel-service/edu-travel-service-commodity/src/main/java/edu/travel/commodity/service/ShopCurrencyService.java

@@ -1,8 +0,0 @@
-package edu.travel.commodity.service;
-
-import edu.travel.commodity.entity.ShopCurrency;
-import com.baomidou.mybatisplus.extension.service.IService;
-public interface ShopCurrencyService extends IService<ShopCurrency>{
-
-
-}

edu-travel-service/edu-travel-service-commodity/src/main/java/edu/travel/commodity/service/impl/ShopCurrencyServiceImpl.java

@@ -1,12 +0,0 @@
-package edu.travel.commodity.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import edu.travel.commodity.entity.ShopCurrency;
-import edu.travel.commodity.mapper.ShopCurrencyMapper;
-import edu.travel.commodity.service.ShopCurrencyService;
-import org.springframework.stereotype.Service;
-
-@Service
-public class ShopCurrencyServiceImpl extends ServiceImpl<ShopCurrencyMapper, ShopCurrency> implements ShopCurrencyService {
-
-}

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

@@ -1,23 +0,0 @@
-package edu.travel.commodity.web;
-
-import edu.travel.commodity.service.ShopCurrencyService;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.beans.factory.annotation.Autowired;
-
-/**
-* 货币表(shop_currency)表控制层
-*
-* @author xxxxx
-*/
-@RestController
-@RequestMapping("/shop_currency")
-public class ShopCurrencyController {
-/**
-* 服务对象
-*/
-    @Autowired
-    private ShopCurrencyService shopCurrencyService;
-
-
-}

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

@@ -1,10 +1,9 @@
-package edu.travel.commodity.entity;
+package edu.travel.country.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 java.util.Date;
 
 import edu.travel.entity.BaseEntity;
 import lombok.AllArgsConstructor;

edu-travel-service/edu-travel-service-commodity/src/main/java/edu/travel/commodity/mapper/ShopCurrencyMapper.java → edu-travel-service/edu-travel-service-country/src/main/java/edu/travel/country/mapper/ShopCurrencyMapper.java

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

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

@@ -0,0 +1,14 @@
+package edu.travel.country.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import edu.travel.country.entity.ShopCurrency;
+import edu.travel.dto.ShopCurrencyDto;
+import edu.travel.rpc.RPCBaseResponse;
+import edu.travel.vo.ShopCurrencyVo;
+
+public interface ShopCurrencyService extends IService<ShopCurrency>{
+
+
+    RPCBaseResponse<IPage<ShopCurrencyVo>> getCurrencyPage(ShopCurrencyDto dto);
+}

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

@@ -0,0 +1,31 @@
+package edu.travel.country.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import edu.travel.country.entity.ShopCurrency;
+import edu.travel.country.mapper.ShopCurrencyMapper;
+import edu.travel.country.service.ShopCurrencyService;
+import edu.travel.dto.ShopCurrencyDto;
+import edu.travel.rpc.RPCBaseResponse;
+import edu.travel.service.SysServiceImpl;
+import edu.travel.vo.ShopCurrencyVo;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class ShopCurrencyServiceImpl extends SysServiceImpl<ShopCurrencyMapper, ShopCurrency> implements ShopCurrencyService {
+
+    @Autowired
+    private ShopCurrencyMapper shopCurrencyMapper;
+    @Override
+    public RPCBaseResponse<IPage<ShopCurrencyVo>> getCurrencyPage(ShopCurrencyDto dto) {
+        Page<ShopCurrency> baseCountryServePage = new Page<>(dto.getCurrentPage(), dto.getPageSize());
+        IPage<ShopCurrency> pageLink = super.getPageLink(new LambdaQueryWrapper<ShopCurrency>(), baseCountryServePage);
+        IPage<ShopCurrencyVo> result = new Page<>();
+        BeanUtils.copyProperties(pageLink, result);
+        return new RPCBaseResponse<>(200,"SUCCESS",result);
+    }
+}

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

@@ -110,7 +110,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

@@ -0,0 +1,113 @@
+package edu.travel.country.web;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import edu.travel.country.entity.ShopCurrency;
+import edu.travel.country.service.ShopCurrencyService;
+import edu.travel.dto.ShopCurrencyDto;
+import edu.travel.remote.ShopCurrencyRemoteController;
+import edu.travel.rpc.RPCBaseResponse;
+import edu.travel.vo.ShopCurrencyVo;
+import edu.travel.web.BaseController;
+import org.springframework.beans.BeanUtils;
+import org.springframework.web.bind.annotation.*;
+
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.List;
+
+/**
+* 货币表(shop_currency)表控制层
+*
+* @author xxxxx
+*/
+@RestController
+@RequestMapping("/shop_currency")
+public class ShopCurrencyController extends BaseController<ShopCurrency> implements ShopCurrencyRemoteController {
+/**
+* 服务对象
+*/
+    @Autowired
+    private ShopCurrencyService shopCurrencyService;
+    /**
+     * 分页
+     */
+
+    @GetMapping("/getCurrencyPage")
+    public RPCBaseResponse<IPage<ShopCurrencyVo>> getCurrencyPage(ShopCurrencyDto dto) {
+        return shopCurrencyService.getCurrencyPage(dto);
+    }
+    /**
+     * 获取货币信息
+     * @param id
+     * @return
+     */
+
+    @Override
+    @GetMapping("/getCurrencyFormId")
+    public RPCBaseResponse<ShopCurrencyVo> getFormId(String id) {
+        RPCBaseResponse<ShopCurrency> shopCurrencyRPCBaseResponse = super.getId(id);
+        RPCBaseResponse<ShopCurrencyVo> shopCurrencyVoRPCBaseResponse = new RPCBaseResponse<>();
+        BeanUtils.copyProperties(shopCurrencyRPCBaseResponse, shopCurrencyVoRPCBaseResponse);
+        return shopCurrencyVoRPCBaseResponse;
+    }
+
+    /**
+     * 更新货币信息
+     * @param entity
+     * @return
+     */
+    @Override
+    @PostMapping("/updateCurrencyFormId")
+    public RPCBaseResponse<ShopCurrencyVo> updateTargetFormId(ShopCurrencyDto entity) {
+        ShopCurrency shopCurrency = new ShopCurrency();
+        BeanUtils.copyProperties(entity, shopCurrency);
+        RPCBaseResponse<ShopCurrency> shopCurrencyRPCBaseResponse = super.updateTargetById(shopCurrency);
+        RPCBaseResponse<ShopCurrencyVo> shopCurrencyVoRPCBaseResponse = new RPCBaseResponse<>();
+        BeanUtils.copyProperties(shopCurrencyRPCBaseResponse, shopCurrencyVoRPCBaseResponse);
+        return shopCurrencyVoRPCBaseResponse;
+    }
+
+    /**
+     * 新增货币信息
+     * @param entity
+     * @return
+     */
+    @Override
+    @PostMapping("/saveCurrencyForm")
+    public RPCBaseResponse<ShopCurrencyVo> saveFormTarget(ShopCurrencyDto entity) {
+        ShopCurrency shopCurrency = new ShopCurrency();
+        BeanUtils.copyProperties(entity, shopCurrency);
+        RPCBaseResponse<ShopCurrency> shopCurrencyRPCBaseResponse = super.saveTarget(shopCurrency);
+        RPCBaseResponse<ShopCurrencyVo> shopCurrencyVoRPCBaseResponse = new RPCBaseResponse<>();
+        BeanUtils.copyProperties(shopCurrencyRPCBaseResponse, shopCurrencyVoRPCBaseResponse);
+        return shopCurrencyVoRPCBaseResponse;
+    }
+
+    /**
+     * 删除货币信息
+     * @param ids
+     * @return
+     */
+    @Override
+    @PostMapping("/deleteCurrencyFormId")
+    public RPCBaseResponse<ShopCurrencyVo> deleteTargetFormId(List<String> ids) {
+        RPCBaseResponse<ShopCurrency> shopCurrencyRPCBaseResponse = super.deleteTargetById(ids);
+        RPCBaseResponse<ShopCurrencyVo> shopCurrencyVoRPCBaseResponse = new RPCBaseResponse<>();
+        BeanUtils.copyProperties(shopCurrencyRPCBaseResponse, shopCurrencyVoRPCBaseResponse);
+        return shopCurrencyVoRPCBaseResponse;
+    }
+
+    /**
+     * 获取所有货币信息
+     * @return
+     */
+    @Override
+    @GetMapping("/listCurrencyForm")
+    public RPCBaseResponse<List<ShopCurrencyVo>> getAllForm() {
+        RPCBaseResponse<List<ShopCurrency>> listRPCBaseResponse = super.listAll();
+        RPCBaseResponse<List<ShopCurrencyVo>> shopCurrencyVoRPCBaseResponse = new RPCBaseResponse<>();
+        BeanUtils.copyProperties(listRPCBaseResponse, shopCurrencyVoRPCBaseResponse);
+        return shopCurrencyVoRPCBaseResponse;
+    }
+}

edu-travel-service/edu-travel-service-commodity/src/main/resources/mapper/ShopCurrencyMapper.xml → edu-travel-service/edu-travel-service-country/src/main/resources/mapper/ShopCurrencyMapper.xml

@@ -1,7 +1,7 @@
 <?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="edu.travel.commodity.mapper.ShopCurrencyMapper">
-  <resultMap id="BaseResultMap" type="edu.travel.commodity.entity.ShopCurrency">
+<mapper namespace="edu.travel.country.mapper.ShopCurrencyMapper">
+  <resultMap id="BaseResultMap" type="edu.travel.country.entity.ShopCurrency">
     <!--@mbg.generated-->
     <!--@Table shop_currency-->
     <id column="id" jdbcType="BIGINT" property="id" />