diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/shop/CereShopCrossDetailDAO.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/shop/CereShopCrossDetailDAO.java new file mode 100644 index 0000000..5a5c896 --- /dev/null +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/shop/CereShopCrossDetailDAO.java @@ -0,0 +1,15 @@ +/* + * Copyright (C) 2017-2021 + * All rights reserved, Designed By 深圳中科鑫智科技有限公司 + * Copyright authorization contact 18814114118 + */ +package com.shop.cereshop.admin.dao.shop; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.shop.cereshop.commons.domain.shop.CereShopCrossDetail; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface CereShopCrossDetailDAO extends BaseMapper { + +} diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/shop/CereShopReturnDAO.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/shop/CereShopReturnDAO.java index 24c7e6e..5ca0e54 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/shop/CereShopReturnDAO.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/shop/CereShopReturnDAO.java @@ -8,9 +8,14 @@ package com.shop.cereshop.admin.dao.shop; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.shop.cereshop.commons.domain.shop.CereShopReturn; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; @Mapper public interface CereShopReturnDAO extends BaseMapper { int insertSelective(CereShopReturn record); + + CereShopReturn findByShopId(@Param("shopId") Long shopId); + + void updateData(CereShopReturn cereShopReturn); } diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/page/shop/ShopCrossDetail.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/page/shop/ShopCrossDetail.java new file mode 100644 index 0000000..3a82d95 --- /dev/null +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/page/shop/ShopCrossDetail.java @@ -0,0 +1,133 @@ +/* + * Copyright (C) 2017-2021 + * All rights reserved, Designed By 深圳中科鑫智科技有限公司 + * Copyright authorization contact 18814114118 + */ +package com.shop.cereshop.admin.page.shop; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 仓库返回数据实体类 + */ +@Data +@ApiModel(value = "Storehouse", description = "仓库返回数据实体类") +public class ShopCrossDetail { + /** + * 拓展信息Id + */ + @ApiModelProperty(value = "拓展信息Id") + private Long crossDetailId; + + /** + * 关联店铺id + */ + @ApiModelProperty(value = "关联店铺id") + private Long shopId; + + /** + * 电商平台名称 + */ + @ApiModelProperty(value = "电商平台名称") + private String ebpname; + + /** + * 电商平台代码 + */ + @ApiModelProperty(value = "电商平台代码") + private String ebpcode; + + /** + * 电商企业名称 + */ + @ApiModelProperty(value = "电商企业名称") + private String ebpcname; + + /** + * 电商企业代码 + */ + @ApiModelProperty(value = "电商企业代码") + private String ebpccode; + /** + * 申报企业名称 + */ + @ApiModelProperty(value = "申报企业名称") + private String agentName; + + /** + * 申报企业代码 + */ + @ApiModelProperty(value = "申报企业代码") + private String agentCode; + /** + * 区内企业名称 + */ + @ApiModelProperty(value = "区内企业名称") + private String areaName; + + /** + * 区内企业代码 + */ + @ApiModelProperty(value = "区内企业代码") + private String areaCode; + /** + * 担保企业名称 + */ + @ApiModelProperty(value = "担保企业名称") + private String assureName; + + /** + * 担保企业代码 + */ + @ApiModelProperty(value = "担保企业代码") + private String assureCode; + /** + * 账册编号 + */ + @ApiModelProperty(value = "账册编号") + private String zcCode; + + /** + * 申报海关代码 + */ + @ApiModelProperty(value = "申报海关代码") + private String sbhgCode; + + /** + * 口岸海关代码 + */ + @ApiModelProperty(value = "口岸海关代码") + private String kahgCode; + + /** + * 订单传输企业名称 + */ + @ApiModelProperty(value = "订单传输企业名称") + private String copName; + + /** + * 订单传输企业代码 + */ + @ApiModelProperty(value = "订单传输企业代码") + private String copCode; + + /** + * 清单传输企业名称 + */ + @ApiModelProperty(value = "清单传输企业名称") + private String copName1; + + /** + * 清单传输企业代码 + */ + @ApiModelProperty(value = "清单传输企业代码") + private String copCode1; + + /** + * 公司对公银行账户 + */ + @ApiModelProperty(value = "公司对公银行账户") + private String bankCode; +} diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/page/shop/ShopGetAll.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/page/shop/ShopGetAll.java index 687278d..5e1e53a 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/page/shop/ShopGetAll.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/page/shop/ShopGetAll.java @@ -6,6 +6,8 @@ package com.shop.cereshop.admin.page.shop; import com.shop.cereshop.commons.domain.shop.CerePlatformShop; +import com.shop.cereshop.commons.domain.shop.CereShopCrossDetail; +import com.shop.cereshop.commons.domain.shop.CereShopReturn; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -22,4 +24,13 @@ public class ShopGetAll extends CerePlatformShop { */ @ApiModelProperty(value = "商家名称") private String businessName; + + /** + * 退货地址信息 + */ + @ApiModelProperty(value = "退货地址信息") + private CereShopReturn shopReturn; + + @ApiModelProperty(value = "具体跨境信息") + private CereShopCrossDetail crossDetail; } diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/param/shop/ShopCrossDetailGetAllParam.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/param/shop/ShopCrossDetailGetAllParam.java new file mode 100644 index 0000000..58f4966 --- /dev/null +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/param/shop/ShopCrossDetailGetAllParam.java @@ -0,0 +1,29 @@ +/* + * Copyright (C) 2017-2021 + * All rights reserved, Designed By 深圳中科鑫智科技有限公司 + * Copyright authorization contact 18814114118 + */ +package com.shop.cereshop.admin.param.shop; + +import com.shop.cereshop.commons.domain.common.PageParam; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * cere_shop_cross_detail 店铺跨境拓展信息 + * @author + */ +@Data +@ApiModel(value = "ShopCrossDetailGetAllParam", description = "获取店铺跨境信息列表请求") +public class ShopCrossDetailGetAllParam extends PageParam implements Serializable { + /** + * 店铺id + */ + @ApiModelProperty(value = "店铺id") + private Long shopId; + + +} diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/param/shop/ShopCrossDetailSaveParam.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/param/shop/ShopCrossDetailSaveParam.java new file mode 100644 index 0000000..b54e484 --- /dev/null +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/param/shop/ShopCrossDetailSaveParam.java @@ -0,0 +1,132 @@ +/* + * Copyright (C) 2017-2021 + * All rights reserved, Designed By 深圳中科鑫智科技有限公司 + * Copyright authorization contact 18814114118 + */ +package com.shop.cereshop.admin.param.shop; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * cere_shop_cross_detail 店铺跨境拓展信息 + * @author + */ +@Data +public class ShopCrossDetailSaveParam implements Serializable { + /** + * 关联店铺id + */ + @ApiModelProperty(value = "关联店铺id") + private Long shopId; + + /** + * 电商平台名称 + */ + @ApiModelProperty(value = "电商平台名称") + private String ebpname; + + /** + * 电商平台代码 + */ + @ApiModelProperty(value = "电商平台代码") + private String ebpcode; + + /** + * 电商企业名称 + */ + @ApiModelProperty(value = "电商企业名称") + private String ebpcname; + + /** + * 电商企业代码 + */ + @ApiModelProperty(value = "电商企业代码") + private String ebpccode; + /** + * 申报企业名称 + */ + @ApiModelProperty(value = "申报企业名称") + private String agentName; + + /** + * 申报企业代码 + */ + @ApiModelProperty(value = "申报企业代码") + private String agentCode; + /** + * 区内企业名称 + */ + @ApiModelProperty(value = "区内企业名称") + private String areaName; + + /** + * 区内企业代码 + */ + @ApiModelProperty(value = "区内企业代码") + private String areaCode; + /** + * 担保企业名称 + */ + @ApiModelProperty(value = "担保企业名称") + private String assureName; + + /** + * 担保企业代码 + */ + @ApiModelProperty(value = "担保企业代码") + private String assureCode; + /** + * 账册编号 + */ + @ApiModelProperty(value = "账册编号") + private String zcCode; + + /** + * 申报海关代码 + */ + @ApiModelProperty(value = "申报海关代码") + private String sbhgCode; + + /** + * 口岸海关代码 + */ + @ApiModelProperty(value = "口岸海关代码") + private String kahgCode; + + /** + * 订单传输企业名称 + */ + @ApiModelProperty(value = "订单传输企业名称") + private String copName; + + /** + * 订单传输企业代码 + */ + @ApiModelProperty(value = "订单传输企业代码") + private String copCode; + + /** + * 清单传输企业名称 + */ + @ApiModelProperty(value = "清单传输企业名称") + private String copName1; + + /** + * 清单传输企业代码 + */ + @ApiModelProperty(value = "清单传输企业代码") + private String copCode1; + + + + /** + * 公司对公银行账户 + */ + @ApiModelProperty(value = "公司对公银行账户") + private String bankCode; + + private static final long serialVersionUID = 1L; +} diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/param/shop/ShopCrossDetailUpdateParam.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/param/shop/ShopCrossDetailUpdateParam.java new file mode 100644 index 0000000..1fe6f5d --- /dev/null +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/param/shop/ShopCrossDetailUpdateParam.java @@ -0,0 +1,132 @@ +/* + * Copyright (C) 2017-2021 + * All rights reserved, Designed By 深圳中科鑫智科技有限公司 + * Copyright authorization contact 18814114118 + */ +package com.shop.cereshop.admin.param.shop; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * cere_shop_cross_detail 店铺跨境拓展信息 + * @author + */ +@Data +public class ShopCrossDetailUpdateParam implements Serializable { + @ApiModelProperty(value = "拓展信息Id") + private Long crossDetailId; + /** + * 关联店铺id + */ + @ApiModelProperty(value = "关联店铺id") + private Long shopId; + + /** + * 电商平台名称 + */ + @ApiModelProperty(value = "电商平台名称") + private String ebpname; + + /** + * 电商平台代码 + */ + @ApiModelProperty(value = "电商平台代码") + private String ebpcode; + + /** + * 电商企业名称 + */ + @ApiModelProperty(value = "电商企业名称") + private String ebpcname; + + /** + * 电商企业代码 + */ + @ApiModelProperty(value = "电商企业代码") + private String ebpccode; + /** + * 申报企业名称 + */ + @ApiModelProperty(value = "申报企业名称") + private String agentName; + + /** + * 申报企业代码 + */ + @ApiModelProperty(value = "申报企业代码") + private String agentCode; + /** + * 区内企业名称 + */ + @ApiModelProperty(value = "区内企业名称") + private String areaName; + + /** + * 区内企业代码 + */ + @ApiModelProperty(value = "区内企业代码") + private String areaCode; + /** + * 担保企业名称 + */ + @ApiModelProperty(value = "担保企业名称") + private String assureName; + + /** + * 担保企业代码 + */ + @ApiModelProperty(value = "担保企业代码") + private String assureCode; + /** + * 账册编号 + */ + @ApiModelProperty(value = "账册编号") + private String zcCode; + + /** + * 申报海关代码 + */ + @ApiModelProperty(value = "申报海关代码") + private String sbhgCode; + + /** + * 口岸海关代码 + */ + @ApiModelProperty(value = "口岸海关代码") + private String kahgCode; + + /** + * 订单传输企业名称 + */ + @ApiModelProperty(value = "订单传输企业名称") + private String copName; + + /** + * 订单传输企业代码 + */ + @ApiModelProperty(value = "订单传输企业代码") + private String copCode; + + /** + * 清单传输企业名称 + */ + @ApiModelProperty(value = "清单传输企业名称") + private String copName1; + + /** + * 清单传输企业代码 + */ + @ApiModelProperty(value = "清单传输企业代码") + private String copCode1; + + /** + * 公司对公银行账户 + */ + @ApiModelProperty(value = "公司对公银行账户") + private String bankCode; + + private static final long serialVersionUID = 1L; +} diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/param/shop/ShopSaveParam.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/param/shop/ShopSaveParam.java index ad9d28c..16e39af 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/param/shop/ShopSaveParam.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/param/shop/ShopSaveParam.java @@ -5,6 +5,8 @@ */ package com.shop.cereshop.admin.param.shop; +import com.shop.cereshop.commons.domain.shop.CereShopCrossDetail; +import com.shop.cereshop.commons.domain.shop.CereShopReturn; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -54,5 +56,13 @@ public class ShopSaveParam { @NotBlank(message = "店铺地址不能为空") private String shopAdress; + /** + * 退货地址信息 + */ + @ApiModelProperty(value = "店铺地址") + private CereShopReturn shopReturn; + + @ApiModelProperty(value = "具体跨境信息") + private CereShopCrossDetail crossDetail; } diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/param/shop/ShopUpdateParam.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/param/shop/ShopUpdateParam.java index ceb1497..6474919 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/param/shop/ShopUpdateParam.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/param/shop/ShopUpdateParam.java @@ -5,6 +5,8 @@ */ package com.shop.cereshop.admin.param.shop; +import com.shop.cereshop.commons.domain.shop.CereShopCrossDetail; +import com.shop.cereshop.commons.domain.shop.CereShopReturn; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -24,6 +26,12 @@ public class ShopUpdateParam { @ApiModelProperty(value = "店铺id") private Long shopId; + /** + * 店铺logo + */ + @ApiModelProperty(value = "店铺logo") + private String shopLogo; + /** * 店铺名称 @@ -60,4 +68,20 @@ public class ShopUpdateParam { @NotBlank(message = "店铺地址不能为空") private String shopAdress; + /** + * 退货地址信息 + */ + @ApiModelProperty(value = "店铺地址") + private CereShopReturn shopReturn; + + + @ApiModelProperty(value = "具体跨境信息") + private CereShopCrossDetail crossDetail; + + /** + * 店铺类型 + */ + @ApiModelProperty(value = "店铺类型") + private Integer shopType; + } diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/shop/CereShopCrossDetailService.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/shop/CereShopCrossDetailService.java new file mode 100644 index 0000000..f39a042 --- /dev/null +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/shop/CereShopCrossDetailService.java @@ -0,0 +1,61 @@ +/* + * Copyright (C) 2017-2021 + * All rights reserved, Designed By 深圳中科鑫智科技有限公司 + * Copyright authorization contact 18814114118 + */ +package com.shop.cereshop.admin.service.shop; + +import com.shop.cereshop.admin.page.shop.ShopCrossDetail; +import com.shop.cereshop.admin.param.shop.ShopCrossDetailGetAllParam; +import com.shop.cereshop.admin.param.shop.ShopCrossDetailSaveParam; +import com.shop.cereshop.admin.param.shop.ShopCrossDetailUpdateParam; +import com.shop.cereshop.commons.domain.business.CerePlatformBusinessUser; +import com.shop.cereshop.commons.domain.common.Page; +import com.shop.cereshop.commons.domain.shop.CereShopCrossDetail; +import com.shop.cereshop.commons.exception.CoBusinessException; + +public interface CereShopCrossDetailService { + + /** + * 查询详情 + * @return + */ + ShopCrossDetail getById(Long crossDetailId); + + /** + * 查询列表 + * @param param + * @return + */ + Page getAll(ShopCrossDetailGetAllParam param); + + /** + * 更新仓库 + * @param shopCrossDetailUpdateParam + * @return + * @throws CoBusinessException + */ + int update(ShopCrossDetailUpdateParam shopCrossDetailUpdateParam) throws CoBusinessException; + + /** + * 插入仓库 + * @param shopCrossDetailSaveParam + * @return + * @throws CoBusinessException + */ + int insert(ShopCrossDetailSaveParam shopCrossDetailSaveParam) throws CoBusinessException; + + /** + * 删除仓库 + * @param storehouseId + * @return + * @throws CoBusinessException + */ + int deleteById(Long storehouseId) throws CoBusinessException; + + CereShopCrossDetail findByShopId(Long shopId); + + void update(CereShopCrossDetail crossDetail) throws CoBusinessException; + + void insert(CereShopCrossDetail crossDetail) throws CoBusinessException; +} diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/shop/CereShopReturnService.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/shop/CereShopReturnService.java index 0ff818d..2d81313 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/shop/CereShopReturnService.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/shop/CereShopReturnService.java @@ -5,5 +5,17 @@ */ package com.shop.cereshop.admin.service.shop; +import com.shop.cereshop.commons.domain.business.CerePlatformBusinessUser; +import com.shop.cereshop.commons.domain.shop.CereShopReturn; +import com.shop.cereshop.commons.exception.CoBusinessException; + public interface CereShopReturnService { + + CereShopReturn findByShopId(Long shopId); + + void updateReturn(CereShopReturn cereShopReturn) throws CoBusinessException; + + void update(CereShopReturn shopReturn) throws CoBusinessException; + + void insert(CereShopReturn shopReturn) throws CoBusinessException; } diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/shop/impl/CerePlatformShopServiceImpl.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/shop/impl/CerePlatformShopServiceImpl.java index b75edb0..db74f77 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/shop/impl/CerePlatformShopServiceImpl.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/shop/impl/CerePlatformShopServiceImpl.java @@ -5,6 +5,7 @@ */ package com.shop.cereshop.admin.service.shop.impl; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.pagehelper.PageHelper; @@ -20,11 +21,15 @@ import com.shop.cereshop.admin.service.common.CommonService; import com.shop.cereshop.admin.service.log.CerePlatformLogService; import com.shop.cereshop.admin.service.product.CereShopProductService; import com.shop.cereshop.admin.service.shop.CerePlatformShopService; +import com.shop.cereshop.admin.service.shop.CereShopCrossDetailService; +import com.shop.cereshop.admin.service.shop.CereShopReturnService; import com.shop.cereshop.admin.utils.EncodeUtil; import com.shop.cereshop.commons.constant.CoReturnFormat; import com.shop.cereshop.commons.constant.IntegerEnum; import com.shop.cereshop.commons.domain.common.Page; import com.shop.cereshop.commons.domain.shop.CerePlatformShop; +import com.shop.cereshop.commons.domain.shop.CereShopCrossDetail; +import com.shop.cereshop.commons.domain.shop.CereShopReturn; import com.shop.cereshop.commons.domain.user.CerePlatformUser; import com.shop.cereshop.commons.exception.CoBusinessException; import com.shop.cereshop.commons.utils.EncryptUtil; @@ -56,6 +61,12 @@ public class CerePlatformShopServiceImpl implements CerePlatformShopService { @Autowired private EncodeUtil encodeUtil; + @Autowired + private CereShopReturnService cereShopReturnService; + + @Autowired + private CereShopCrossDetailService cereShopCrossDetailService; + @Override @Transactional(isolation= Isolation.DEFAULT,propagation= Propagation.REQUIRED,rollbackFor = {CoBusinessException.class, Exception.class}) public void save(ShopSaveParam param, CerePlatformUser user) throws CoBusinessException { @@ -83,8 +94,38 @@ public class CerePlatformShopServiceImpl implements CerePlatformShopService { cerePlatformShop.setCreateTime(time); cerePlatformShop.setUpdateTime(time); cerePlatformShopDAO.insert(cerePlatformShop); + + if (ObjectUtil.isNotEmpty(param.getShopReturn())){ + //查询是否有退货地址信息 + CereShopReturn shopReturn=cereShopReturnService.findByShopId(cerePlatformShop.getShopId()); + if(ObjectUtil.isNotEmpty(shopReturn)){ + //更新退货地址 + shopReturn.setReturnAdress(param.getShopReturn().getReturnAdress()); + shopReturn.setReturnPerson(param.getShopReturn().getReturnPerson()); + shopReturn.setReturnPhone(param.getShopReturn().getReturnPhone()); + cereShopReturnService.update(shopReturn); + }else { + param.getShopReturn().setShopId(cerePlatformShop.getShopId()); + cereShopReturnService.insert(param.getShopReturn()); + } + } + + if (ObjectUtil.isNotEmpty(param.getCrossDetail())){ + //查询是否有跨境设置 + CereShopCrossDetail crossDetail = cereShopCrossDetailService.findByShopId(cerePlatformShop.getShopId()); + if(ObjectUtil.isNotEmpty(crossDetail)){ + //更新跨境设置 + crossDetail.setEbpname(param.getCrossDetail().getEbpname()); + crossDetail.setEbpcode(param.getCrossDetail().getEbpcode()); + cereShopCrossDetailService.update(crossDetail); + }else { + param.getCrossDetail().setShopId(cerePlatformShop.getShopId()); + cereShopCrossDetailService.insert(param.getCrossDetail()); + } + } + //新增日志 - cerePlatformLogService.addLog(user,"商家管理","平台端操作","添加商家",String.valueOf(cerePlatformShop.getShopId()),time); + cerePlatformLogService.addLog(user,"商家管理","平台端操作","添加店铺",String.valueOf(cerePlatformShop.getShopId()),time); } @Override @@ -116,8 +157,36 @@ public class CerePlatformShopServiceImpl implements CerePlatformShopService { cerePlatformShop.setUpdateTime(time); //修改商家数据 cerePlatformShopDAO.updateById(cerePlatformShop); + if (ObjectUtil.isNotEmpty(param.getShopReturn())){ + //查询是否有退货地址信息 + CereShopReturn shopReturn = cereShopReturnService.findByShopId(param.getShopId()); + if (ObjectUtil.isNotEmpty(shopReturn)){ + //更新退货地址 + shopReturn.setReturnAdress(param.getShopReturn().getReturnAdress()); + shopReturn.setReturnPerson(param.getShopReturn().getReturnPerson()); + shopReturn.setReturnPhone(param.getShopReturn().getReturnPhone()); + cereShopReturnService.update(shopReturn); + }else { + param.getShopReturn().setShopId(param.getShopId()); + cereShopReturnService.insert(param.getShopReturn()); + } + } + + if (ObjectUtil.isNotEmpty(param.getCrossDetail())){ + //查询是否有跨境设置 + CereShopCrossDetail crossDetail = cereShopCrossDetailService.findByShopId(param.getShopId()); + if(ObjectUtil.isNotEmpty(crossDetail)){ + //更新跨境信息 + crossDetail.setEbpname(param.getCrossDetail().getEbpname()); + crossDetail.setEbpcode(param.getCrossDetail().getEbpcode()); + cereShopCrossDetailService.update(crossDetail); + }else { + param.getCrossDetail().setShopId(param.getShopId()); + cereShopCrossDetailService.insert(param.getCrossDetail()); + } + } //新增日志 - cerePlatformLogService.addLog(user,"商家管理","平台端操作","修改商家",String.valueOf(cerePlatformShop.getShopId()),time); + cerePlatformLogService.addLog(user,"商家管理","平台端操作","修改店铺",String.valueOf(cerePlatformShop.getShopId()),time); } @Override @@ -144,8 +213,23 @@ public class CerePlatformShopServiceImpl implements CerePlatformShopService { @Override public ShopGetAll getById(Long shopId) throws CoBusinessException,Exception { ShopGetAll shop = cerePlatformShopDAO.getById(shopId); - //解密密码 - shop.setShopPassword(EncryptUtil.decrypt(shop.getShopPassword())); + if (ObjectUtil.isNotEmpty(shop)){ + //解密密码 + shop.setShopPassword(EncryptUtil.decrypt(shop.getShopPassword())); + //查询店铺退货地址信息 + CereShopReturn cereShopReturn=cereShopReturnService.findByShopId(shopId); + shop.setShopReturn(cereShopReturn); + if(shop.getShopReturn() == null){ + shop.setShopReturn(new CereShopReturn()); + } + + CereShopCrossDetail crossDetail = cereShopCrossDetailService.findByShopId(shopId); + shop.setCrossDetail(crossDetail); + if(shop.getCrossDetail() == null){ + shop.setCrossDetail(new CereShopCrossDetail()); + } + } + return shop; } diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/shop/impl/CereShopCrossDetailServiceImpl.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/shop/impl/CereShopCrossDetailServiceImpl.java new file mode 100644 index 0000000..e378ac3 --- /dev/null +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/shop/impl/CereShopCrossDetailServiceImpl.java @@ -0,0 +1,107 @@ +/* + * Copyright (C) 2017-2021 + * All rights reserved, Designed By 深圳中科鑫智科技有限公司 + * Copyright authorization contact 18814114118 + */ +package com.shop.cereshop.admin.service.shop.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.shop.cereshop.admin.dao.shop.CereShopCrossDetailDAO; +import com.shop.cereshop.admin.page.shop.ShopCrossDetail; +import com.shop.cereshop.admin.param.shop.ShopCrossDetailGetAllParam; +import com.shop.cereshop.admin.param.shop.ShopCrossDetailSaveParam; +import com.shop.cereshop.admin.param.shop.ShopCrossDetailUpdateParam; +import com.shop.cereshop.admin.service.shop.CereShopCrossDetailService; +import com.shop.cereshop.commons.domain.common.Page; +import com.shop.cereshop.commons.domain.shop.CereShopCrossDetail; +import com.shop.cereshop.commons.exception.CoBusinessException; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Isolation; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; +import java.util.stream.Collectors; + +@Service +public class CereShopCrossDetailServiceImpl implements CereShopCrossDetailService { + + @Autowired + private CereShopCrossDetailDAO cereShopCrossDetailDAO; + + @Override + public ShopCrossDetail getById(Long crossDetailId) { + ShopCrossDetail shopCrossDetail = new ShopCrossDetail(); + CereShopCrossDetail cereShopCrossDetail = cereShopCrossDetailDAO.selectById(crossDetailId); + BeanUtils.copyProperties(cereShopCrossDetail, shopCrossDetail); + return shopCrossDetail; + } + + @Override + public Page getAll(ShopCrossDetailGetAllParam param) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(CereShopCrossDetail::getShopId, param.getShopId()); +// wrapper.like(StringUtils.isNotBlank(param.getStorehouseName()), CereShopStorehouse::getStorehouseName, param.getStorehouseName()); + + PageHelper.startPage(param.getPage(),param.getPageSize()); + List list= cereShopCrossDetailDAO.selectList(wrapper); + List shopCrossDetailList= list.stream().map(item -> { + ShopCrossDetail shopCrossDetail = new ShopCrossDetail(); + BeanUtils.copyProperties(item, shopCrossDetail); + return shopCrossDetail; + }).collect(Collectors.toList()); + PageInfo pageInfo=new PageInfo<>(shopCrossDetailList); + return new Page<>(pageInfo.getList(), pageInfo.getTotal()); + } + + @Override + @Transactional(isolation= Isolation.DEFAULT,propagation= Propagation.REQUIRED,rollbackFor = {CoBusinessException.class, Exception.class}) + public int update(ShopCrossDetailUpdateParam shopCrossDetailUpdateParam) throws CoBusinessException { + CereShopCrossDetail cereShopCrossDetail = new CereShopCrossDetail(); + BeanUtils.copyProperties(shopCrossDetailUpdateParam, cereShopCrossDetail); + int result = cereShopCrossDetailDAO.updateById(cereShopCrossDetail); + return result; + } + + @Override + @Transactional(isolation= Isolation.DEFAULT,propagation= Propagation.REQUIRED,rollbackFor = {CoBusinessException.class, Exception.class}) + public int insert(ShopCrossDetailSaveParam shopCrossDetailSaveParam) throws CoBusinessException { + CereShopCrossDetail cereShopCrossDetail = new CereShopCrossDetail(); + BeanUtils.copyProperties(shopCrossDetailSaveParam, cereShopCrossDetail); + int result = cereShopCrossDetailDAO.insert(cereShopCrossDetail); + return result; + } + + @Override + @Transactional(isolation= Isolation.DEFAULT,propagation= Propagation.REQUIRED,rollbackFor = {CoBusinessException.class, Exception.class}) + public int deleteById(Long crossDetailId) throws CoBusinessException { + CereShopCrossDetail cereShopCrossDetail=new CereShopCrossDetail(); + cereShopCrossDetail.setCrossDetailId(crossDetailId); + int result = cereShopCrossDetailDAO.deleteById(cereShopCrossDetail); + return result; + } + + @Override + public CereShopCrossDetail findByShopId(Long shopId){ + List crossDetailList = cereShopCrossDetailDAO.selectList(Wrappers.lambdaQuery().in(CereShopCrossDetail::getShopId, shopId)); + if(crossDetailList != null && !crossDetailList.isEmpty()){ + return crossDetailList.get(0); + } + return null; + } + + @Override + public void update(CereShopCrossDetail crossDetail) throws CoBusinessException { + cereShopCrossDetailDAO.updateById(crossDetail); + } + + @Override + public void insert(CereShopCrossDetail crossDetail) throws CoBusinessException { + cereShopCrossDetailDAO.insert(crossDetail); + } +} diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/shop/impl/CereShopReturnServiceImpl.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/shop/impl/CereShopReturnServiceImpl.java index 63c3a21..6d20b68 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/shop/impl/CereShopReturnServiceImpl.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/shop/impl/CereShopReturnServiceImpl.java @@ -5,9 +5,38 @@ */ package com.shop.cereshop.admin.service.shop.impl; +import com.shop.cereshop.admin.dao.shop.CereShopReturnDAO; import com.shop.cereshop.admin.service.shop.CereShopReturnService; +import com.shop.cereshop.commons.domain.business.CerePlatformBusinessUser; +import com.shop.cereshop.commons.domain.shop.CereShopReturn; +import com.shop.cereshop.commons.exception.CoBusinessException; +import com.shop.cereshop.commons.utils.TimeUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @Service public class CereShopReturnServiceImpl implements CereShopReturnService { + + @Autowired + private CereShopReturnDAO cereShopReturnDAO; + + @Override + public CereShopReturn findByShopId(Long shopId) { + return cereShopReturnDAO.findByShopId(shopId); + } + + @Override + public void updateReturn(CereShopReturn cereShopReturn) throws CoBusinessException { + cereShopReturnDAO.updateData(cereShopReturn); + } + + @Override + public void update(CereShopReturn shopReturn) throws CoBusinessException { + cereShopReturnDAO.updateData(shopReturn); + } + + @Override + public void insert(CereShopReturn shopReturn) throws CoBusinessException { + cereShopReturnDAO.insert(shopReturn); + } } diff --git a/cereshop-admin/src/main/resources/mybatis/mapper/shop/CerePlatformShopDAO.xml b/cereshop-admin/src/main/resources/mybatis/mapper/shop/CerePlatformShopDAO.xml index 1679a88..c0383ca 100644 --- a/cereshop-admin/src/main/resources/mybatis/mapper/shop/CerePlatformShopDAO.xml +++ b/cereshop-admin/src/main/resources/mybatis/mapper/shop/CerePlatformShopDAO.xml @@ -307,10 +307,10 @@ where c.shop_id=#{shopId} - SELECT a.shop_id, a.business_id, a.shop_code, a.shop_name, a.shop_brief, a.shop_phone, a.shop_password, a.charge_person_name, + SELECT a.shop_id, a.business_id, a.shop_code, a.shop_name, a.shop_logo, a.shop_brief, a.shop_phone, a.shop_password, a.charge_person_name, a.charge_person_phone, a.shop_adress, a.effective_date, a.effective_year, a.contract_state, a.authentication_state, a.check_state, a.`state`, a.authen_type, a.create_time, a.update_time, - a.audit_live, a.audit_live_product,b.business_name + a.audit_live, a.audit_live_product, a.shop_type, b.business_name FROM cere_platform_shop a INNER JOIN cere_platform_business b ON a.business_id = b.business_id diff --git a/cereshop-admin/src/main/resources/mybatis/mapper/shop/CereShopReturnDAO.xml b/cereshop-admin/src/main/resources/mybatis/mapper/shop/CereShopReturnDAO.xml index d8674b9..29fde1a 100644 --- a/cereshop-admin/src/main/resources/mybatis/mapper/shop/CereShopReturnDAO.xml +++ b/cereshop-admin/src/main/resources/mybatis/mapper/shop/CereShopReturnDAO.xml @@ -38,4 +38,13 @@ + + + + + UPDATE cere_shop_return set return_adress=#{returnAdress},return_person=#{returnPerson},return_phone=#{returnPhone} + where shop_id=#{shopId} + diff --git a/cereshop-business/src/main/java/com/shop/cereshop/business/service/shop/impl/CerePlatformShopServiceImpl.java b/cereshop-business/src/main/java/com/shop/cereshop/business/service/shop/impl/CerePlatformShopServiceImpl.java index 79c17f2..3999961 100644 --- a/cereshop-business/src/main/java/com/shop/cereshop/business/service/shop/impl/CerePlatformShopServiceImpl.java +++ b/cereshop-business/src/main/java/com/shop/cereshop/business/service/shop/impl/CerePlatformShopServiceImpl.java @@ -105,9 +105,9 @@ public class CerePlatformShopServiceImpl implements CerePlatformShopService { //查询是否有跨境设置 CereShopCrossDetail crossDetail = cereShopCrossDetailService.findByShopId(param.getShopId()); if(crossDetail!=null){ - //更新退货地址 - crossDetail.setEbpname(param.getShopReturn().getReturnAdress()); - crossDetail.setEbpcode(param.getShopReturn().getReturnPerson()); + //更新跨境信息 + crossDetail.setEbpname(param.getCrossDetail().getEbpname()); + crossDetail.setEbpcode(param.getCrossDetail().getEbpcode()); cereShopCrossDetailService.update(crossDetail); }else { param.getCrossDetail().setShopId(param.getShopId()); @@ -198,9 +198,9 @@ public class CerePlatformShopServiceImpl implements CerePlatformShopService { //查询是否有跨境设置 CereShopCrossDetail crossDetail = cereShopCrossDetailService.findByShopId(cerePlatformShop.getShopId()); if(crossDetail!=null){ - //更新退货地址 - crossDetail.setEbpname(param.getShopReturn().getReturnAdress()); - crossDetail.setEbpcode(param.getShopReturn().getReturnPerson()); + //更新跨境设置 + crossDetail.setEbpname(param.getCrossDetail().getEbpname()); + crossDetail.setEbpcode(param.getCrossDetail().getEbpcode()); cereShopCrossDetailService.update(crossDetail); }else { param.getCrossDetail().setShopId(cerePlatformShop.getShopId());