From 99595a029248b6198687a608cad624e07bb24227 Mon Sep 17 00:00:00 2001 From: xh-pan1 Date: Sun, 30 Apr 2023 08:50:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8B=86=E5=8D=95=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/shop/cereshop/admin/page/product/Sku.java | 5 + .../mybatis/mapper/product/CereProductSkuDAO.xml | 28 +- .../mybatis/mapper/product/CereShopProductDAO.xml | 6 +- .../app/controller/extend/XsPayController.java | 92 +++ .../app/dao/buyer/CereBuyerShopCouponDAO.java | 2 +- .../app/dao/logistics/CereOrderLogisticsDAO.java | 2 + .../cereshop/app/dao/order/CereShopOrderDAO.java | 2 + .../app/dao/product/CereProductSkuDAO.java | 2 +- .../app/dao/shop/CereShopCrossDetailDAO.java | 15 + .../app/dao/storehouse/CereShopStorehouseDAO.java | 15 + .../app/domain/stock/CrossStockResponeBo.java | 21 + .../app/domain/stock/IbOrderItemRequestBo.java | 21 + .../app/domain/stock/KjtStockNumberResponeBo.java | 34 + .../app/domain/stock/NewIbOrderRequestBo.java | 73 ++ .../com/shop/cereshop/app/page/cart/CartSku.java | 16 + .../cereshop/app/page/product/ProductDetail.java | 22 +- .../cereshop/app/page/product/ProductSkus.java | 6 + .../app/page/settlement/SettlementShop.java | 23 + .../app/param/order/OrderProductParam.java | 17 + .../app/pay/xs/service/impl/XsPayServiceImpl.java | 312 +++++--- .../service/buyer/CereBuyerShopCouponService.java | 2 +- .../buyer/impl/CereBuyerShopCouponServiceImpl.java | 4 +- .../app/service/extend/impl/HuaxunServiceImpl.java | 4 +- .../logistics/CereOrderLogisticsService.java | 2 + .../impl/CereOrderLogisticsServiceImpl.java | 5 + .../order/impl/CereShopOrderServiceImpl.java | 798 ++++++++++++--------- .../order/placeOrderTemplate/JoinPlaceOrder.java | 6 + .../order/placeOrderTemplate/LaunchPlaceOrder.java | 8 +- .../order/placeOrderTemplate/NormalPlaceOrder.java | 19 +- .../placeOrderTemplate/PlaceOrderTemplate.java | 48 +- .../app/service/product/CereProductSkuService.java | 2 +- .../product/impl/CereProductSkuServiceImpl.java | 4 +- .../product/impl/CereShopProductServiceImpl.java | 36 +- .../app/service/stock/CrossStockService.java | 19 + .../service/stock/impl/CrossStockServiceImpl.java | 114 +++ .../storehouse/CereShopStorehouseService.java | 26 + .../impl/CereShopStorehouseServiceImpl.java | 36 + cereshop-app/src/main/resources/application.yml | 10 + .../mapper/buyer/CereBuyerShopCouponDAO.xml | 4 +- .../mapper/logistics/CereOrderLogisticsDAO.xml | 8 + .../mybatis/mapper/order/CereShopOrderDAO.xml | 8 + .../mybatis/mapper/product/CereProductSkuDAO.xml | 36 +- .../mybatis/mapper/product/CereShopProductDAO.xml | 5 +- .../mapper/storehouse/CereShopStorehouseDAO.xml | 23 + .../business/page/logistics/Logistics.java | 12 + .../business/page/product/ShopProduct.java | 12 + .../cereshop/business/page/tool/ToolProduct.java | 12 + .../business/param/logistics/LogistSaveParam.java | 6 + .../param/logistics/LogistUpdateParam.java | 6 + .../cereshop/business/param/product/SkuParam.java | 6 + .../param/shop/ShopCrossDetailGetAllParam.java | 29 + .../param/shop/ShopCrossDetailGetByIdParam.java | 28 + .../param/shop/ShopCrossDetailSaveParam.java | 132 ++++ .../param/shop/ShopCrossDetailUpdateParam.java | 132 ++++ .../impl/CereOrderLogisticsServiceImpl.java | 3 + .../product/impl/CereShopProductServiceImpl.java | 1 + .../mapper/logistics/CereOrderLogisticsDAO.xml | 27 +- .../mybatis/mapper/product/CereProductSkuDAO.xml | 28 +- .../mybatis/mapper/tool/CereShopDiscountDAO.xml | 2 +- .../cereshop/commons/config/CrossStockConfig.java | 41 ++ .../shop/cereshop/commons/config/HuaxunConfig.java | 33 +- .../cereshop/commons/constant/CoReturnFormat.java | 3 + .../domain/logistics/CereOrderLogistics.java | 5 + .../commons/domain/order/CereOrderProduct.java | 2 +- .../commons/domain/order/CereShopOrder.java | 6 + .../commons/domain/product/CereProductSku.java | 6 + 66 files changed, 1943 insertions(+), 530 deletions(-) create mode 100644 cereshop-app/src/main/java/com/shop/cereshop/app/controller/extend/XsPayController.java create mode 100644 cereshop-app/src/main/java/com/shop/cereshop/app/dao/shop/CereShopCrossDetailDAO.java create mode 100644 cereshop-app/src/main/java/com/shop/cereshop/app/dao/storehouse/CereShopStorehouseDAO.java create mode 100644 cereshop-app/src/main/java/com/shop/cereshop/app/domain/stock/CrossStockResponeBo.java create mode 100644 cereshop-app/src/main/java/com/shop/cereshop/app/domain/stock/IbOrderItemRequestBo.java create mode 100644 cereshop-app/src/main/java/com/shop/cereshop/app/domain/stock/KjtStockNumberResponeBo.java create mode 100644 cereshop-app/src/main/java/com/shop/cereshop/app/domain/stock/NewIbOrderRequestBo.java create mode 100644 cereshop-app/src/main/java/com/shop/cereshop/app/service/stock/CrossStockService.java create mode 100644 cereshop-app/src/main/java/com/shop/cereshop/app/service/stock/impl/CrossStockServiceImpl.java create mode 100644 cereshop-app/src/main/java/com/shop/cereshop/app/service/storehouse/CereShopStorehouseService.java create mode 100644 cereshop-app/src/main/java/com/shop/cereshop/app/service/storehouse/impl/CereShopStorehouseServiceImpl.java create mode 100644 cereshop-app/src/main/resources/mybatis/mapper/storehouse/CereShopStorehouseDAO.xml create mode 100644 cereshop-business/src/main/java/com/shop/cereshop/business/param/shop/ShopCrossDetailGetAllParam.java create mode 100644 cereshop-business/src/main/java/com/shop/cereshop/business/param/shop/ShopCrossDetailGetByIdParam.java create mode 100644 cereshop-business/src/main/java/com/shop/cereshop/business/param/shop/ShopCrossDetailSaveParam.java create mode 100644 cereshop-business/src/main/java/com/shop/cereshop/business/param/shop/ShopCrossDetailUpdateParam.java create mode 100644 cereshop-commons/src/main/java/com/shop/cereshop/commons/config/CrossStockConfig.java diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/page/product/Sku.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/page/product/Sku.java index b7e3bac..a228f21 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/page/product/Sku.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/page/product/Sku.java @@ -31,4 +31,9 @@ public class Sku extends CereProductSku { * 规格属性信息 */ private List cereSkuNames; + + /** + * 仓库名称 + */ + private String storehouseName; } diff --git a/cereshop-admin/src/main/resources/mybatis/mapper/product/CereProductSkuDAO.xml b/cereshop-admin/src/main/resources/mybatis/mapper/product/CereProductSkuDAO.xml index 42666b7..bb51cdf 100644 --- a/cereshop-admin/src/main/resources/mybatis/mapper/product/CereProductSkuDAO.xml +++ b/cereshop-admin/src/main/resources/mybatis/mapper/product/CereProductSkuDAO.xml @@ -7,6 +7,8 @@ + + @@ -16,7 +18,7 @@ - sku_id, product_id,SKU, price, original_price, stock_number,total, weight, + sku_id, product_id,SKU, price, original_price, rate, storehouse_id, stock_number,total, weight, sku_image, `style`, create_time, update_time SELECT a.shop_id,d.shop_name,a.product_id,a.product_name,x.users,d.shop_logo, IF(h.image IS NULL OR h.image='',c.product_image,h.image) image, - b.price,b.sku_id,b.original_price,IF(f.number IS NULL,0,f.number) number,b.stock_number from cere_shop_product a - LEFT JOIN (SELECT a.product_id,a.price,a.sku_id,a.original_price,a.stock_number from cere_product_sku a,cere_shop_product b + b.price,b.sku_id,b.original_price,b.rate, IF(f.number IS NULL,0,f.number) number,b.stock_number from cere_shop_product a + LEFT JOIN (SELECT a.product_id,a.price,a.sku_id,a.original_price,a.rate,a.stock_number from cere_product_sku a,cere_shop_product b where a.product_id=b.product_id GROUP BY a.product_id) b ON a.product_id=b.product_id LEFT JOIN (SELECT a.product_id,a.product_image from cere_product_image a,cere_shop_product b where a.product_id=b.product_id GROUP BY a.product_id) c ON a.product_id=c.product_id @@ -279,7 +279,7 @@ SELECT * FROM cere_buyer_shop_coupon where id in ( - - #{item.id} + + #{shopId} ) diff --git a/cereshop-app/src/main/resources/mybatis/mapper/logistics/CereOrderLogisticsDAO.xml b/cereshop-app/src/main/resources/mybatis/mapper/logistics/CereOrderLogisticsDAO.xml index 0702d88..9ba48e9 100644 --- a/cereshop-app/src/main/resources/mybatis/mapper/logistics/CereOrderLogisticsDAO.xml +++ b/cereshop-app/src/main/resources/mybatis/mapper/logistics/CereOrderLogisticsDAO.xml @@ -105,6 +105,14 @@ SELECT * FROM cere_order_logistics where shop_id=#{shopId} + + diff --git a/cereshop-app/src/main/resources/mybatis/mapper/order/CereShopOrderDAO.xml b/cereshop-app/src/main/resources/mybatis/mapper/order/CereShopOrderDAO.xml index 08d6e81..410178a 100644 --- a/cereshop-app/src/main/resources/mybatis/mapper/order/CereShopOrderDAO.xml +++ b/cereshop-app/src/main/resources/mybatis/mapper/order/CereShopOrderDAO.xml @@ -475,6 +475,14 @@ SELECT shop_id,shop_name,shop_adress,shop_logo FROM cere_platform_shop where shop_id=#{shopId} + + @@ -44,6 +45,9 @@ original_price, + + rate, + stock_number, @@ -117,6 +121,9 @@ original_price = #{originalPrice,jdbcType=DECIMAL}, + + rate = #{rate,jdbcType=DECIMAL}, + stock_number = #{stockNumber,jdbcType=INTEGER}, @@ -147,6 +154,7 @@ SKU = #{SKU,jdbcType=VARCHAR}, price = #{price,jdbcType=DECIMAL}, original_price = #{originalPrice,jdbcType=DECIMAL}, + rate = #{rate,jdbcType=DECIMAL}, stock_number = #{stockNumber,jdbcType=INTEGER}, total = #{total,jdbcType=INTEGER}, weight = #{weight,jdbcType=DECIMAL}, @@ -183,7 +191,7 @@ SELECT a.sku_id,a.stock_number, - a.original_price, + a.original_price,a.rate, IF(d.image IS NULL,c.product_image,d.image) image, IF(m.price IS NULL,IF(n.seckill_price IS NULL, IF(h.price IS NULL,a.price,h.price),n.seckill_price),m.price) price, @@ -287,7 +295,7 @@ select a.product_id, a.shop_id, a.product_text as text, a.shelve_state, a.if_huabei, a.product_brief, a.classify_id, a.if_logistics, - b.sku_id, b.weight, b.price, b.original_price + b.sku_id, b.weight, b.price, b.original_price, b.storehouse_id, + b.rate, c.shop_name, c.shop_logo from cere_shop_product a join cere_product_sku b on b.product_id = a.product_id join cere_platform_shop c on a.shop_id = c.shop_id diff --git a/cereshop-app/src/main/resources/mybatis/mapper/storehouse/CereShopStorehouseDAO.xml b/cereshop-app/src/main/resources/mybatis/mapper/storehouse/CereShopStorehouseDAO.xml new file mode 100644 index 0000000..a272616 --- /dev/null +++ b/cereshop-app/src/main/resources/mybatis/mapper/storehouse/CereShopStorehouseDAO.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + storehouse_id, shop_id, storehouse_name, type, kind, if_cashier, one_product_order_price_limit, more_product_order_price_limit,one_product_num_limit,more_product_num_limit, order_number_limit,create_time,update_time + + + diff --git a/cereshop-business/src/main/java/com/shop/cereshop/business/page/logistics/Logistics.java b/cereshop-business/src/main/java/com/shop/cereshop/business/page/logistics/Logistics.java index 2b47a31..e6ef472 100644 --- a/cereshop-business/src/main/java/com/shop/cereshop/business/page/logistics/Logistics.java +++ b/cereshop-business/src/main/java/com/shop/cereshop/business/page/logistics/Logistics.java @@ -31,6 +31,18 @@ public class Logistics { private String logisticsName; /** + * 仓库id + */ + @ApiModelProperty(value = "仓库id") + private Long storehouseId; + + /** + * 仓库名称 + */ + @ApiModelProperty(value = "仓库名称") + private String storehouseName; + + /** * 计费方式 1-按件数 2-按重量 3-全国包邮 */ @ApiModelProperty(value = "计费方式 1-按件数 2-按重量 3-全国包邮") diff --git a/cereshop-business/src/main/java/com/shop/cereshop/business/page/product/ShopProduct.java b/cereshop-business/src/main/java/com/shop/cereshop/business/page/product/ShopProduct.java index 2a742f3..399f652 100644 --- a/cereshop-business/src/main/java/com/shop/cereshop/business/page/product/ShopProduct.java +++ b/cereshop-business/src/main/java/com/shop/cereshop/business/page/product/ShopProduct.java @@ -148,6 +148,18 @@ public class ShopProduct { private BigDecimal originalPrice; /** + * 税率 + */ + @ApiModelProperty(value = "税率") + private BigDecimal rate; + + /** + * 仓库Id + */ + @ApiModelProperty(value = "仓库Id") + private Long storehouseId; + + /** * 库存 */ @ApiModelProperty(value = "库存") diff --git a/cereshop-business/src/main/java/com/shop/cereshop/business/page/tool/ToolProduct.java b/cereshop-business/src/main/java/com/shop/cereshop/business/page/tool/ToolProduct.java index 5f5643f..9ea3038 100644 --- a/cereshop-business/src/main/java/com/shop/cereshop/business/page/tool/ToolProduct.java +++ b/cereshop-business/src/main/java/com/shop/cereshop/business/page/tool/ToolProduct.java @@ -49,6 +49,12 @@ public class ToolProduct { private BigDecimal originalPrice; /** + * 税率 + */ + @ApiModelProperty(value = "税率") + private BigDecimal rate; + + /** * 活动价格 */ @ApiModelProperty(value = "活动价格") @@ -61,6 +67,12 @@ public class ToolProduct { private BigDecimal discount; /** + * 仓库Id + */ + @ApiModelProperty(value = "仓库Id") + private Integer storehouseId; + + /** * 库存数量 */ @ApiModelProperty(value = "库存数量") diff --git a/cereshop-business/src/main/java/com/shop/cereshop/business/param/logistics/LogistSaveParam.java b/cereshop-business/src/main/java/com/shop/cereshop/business/param/logistics/LogistSaveParam.java index 8e04d32..4279313 100644 --- a/cereshop-business/src/main/java/com/shop/cereshop/business/param/logistics/LogistSaveParam.java +++ b/cereshop-business/src/main/java/com/shop/cereshop/business/param/logistics/LogistSaveParam.java @@ -28,6 +28,12 @@ public class LogistSaveParam { private Long shopId; /** + * 仓库id + */ + @ApiModelProperty(value = "仓库id") + private Long storehouseId; + + /** * 方案名称 */ @ApiModelProperty(value = "方案名称") diff --git a/cereshop-business/src/main/java/com/shop/cereshop/business/param/logistics/LogistUpdateParam.java b/cereshop-business/src/main/java/com/shop/cereshop/business/param/logistics/LogistUpdateParam.java index ce716be..190f78a 100644 --- a/cereshop-business/src/main/java/com/shop/cereshop/business/param/logistics/LogistUpdateParam.java +++ b/cereshop-business/src/main/java/com/shop/cereshop/business/param/logistics/LogistUpdateParam.java @@ -31,6 +31,12 @@ public class LogistUpdateParam { private Long shopId; /** + * 仓库id + */ + @ApiModelProperty(value = "仓库id") + private Long storehouseId; + + /** * 方案名称 */ @ApiModelProperty(value = "方案名称") diff --git a/cereshop-business/src/main/java/com/shop/cereshop/business/param/product/SkuParam.java b/cereshop-business/src/main/java/com/shop/cereshop/business/param/product/SkuParam.java index 6bccd60..216be88 100644 --- a/cereshop-business/src/main/java/com/shop/cereshop/business/param/product/SkuParam.java +++ b/cereshop-business/src/main/java/com/shop/cereshop/business/param/product/SkuParam.java @@ -54,6 +54,12 @@ public class SkuParam { private BigDecimal originalPrice; /** + * 税率 + */ + @ApiModelProperty(value = "税率") + private BigDecimal rate; + + /** * * 所属仓库 */ @ApiModelProperty(value = "所属仓库") diff --git a/cereshop-business/src/main/java/com/shop/cereshop/business/param/shop/ShopCrossDetailGetAllParam.java b/cereshop-business/src/main/java/com/shop/cereshop/business/param/shop/ShopCrossDetailGetAllParam.java new file mode 100644 index 0000000..e374998 --- /dev/null +++ b/cereshop-business/src/main/java/com/shop/cereshop/business/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.business.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-business/src/main/java/com/shop/cereshop/business/param/shop/ShopCrossDetailGetByIdParam.java b/cereshop-business/src/main/java/com/shop/cereshop/business/param/shop/ShopCrossDetailGetByIdParam.java new file mode 100644 index 0000000..421319b --- /dev/null +++ b/cereshop-business/src/main/java/com/shop/cereshop/business/param/shop/ShopCrossDetailGetByIdParam.java @@ -0,0 +1,28 @@ +/* + * Copyright (C) 2017-2021 + * All rights reserved, Designed By 深圳中科鑫智科技有限公司 + * Copyright authorization contact 18814114118 + */ +package com.shop.cereshop.business.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 = "ShopCrossDetailGetByIdParam", description = "获取店铺跨境信息详情请求") +public class ShopCrossDetailGetByIdParam extends PageParam implements Serializable { + /** + * 店铺秒杀活动id + */ + @ApiModelProperty(value = "拓展信息Id") + private Long crossDetailId; + +} diff --git a/cereshop-business/src/main/java/com/shop/cereshop/business/param/shop/ShopCrossDetailSaveParam.java b/cereshop-business/src/main/java/com/shop/cereshop/business/param/shop/ShopCrossDetailSaveParam.java new file mode 100644 index 0000000..67cc6db --- /dev/null +++ b/cereshop-business/src/main/java/com/shop/cereshop/business/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.business.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-business/src/main/java/com/shop/cereshop/business/param/shop/ShopCrossDetailUpdateParam.java b/cereshop-business/src/main/java/com/shop/cereshop/business/param/shop/ShopCrossDetailUpdateParam.java new file mode 100644 index 0000000..7c453cb --- /dev/null +++ b/cereshop-business/src/main/java/com/shop/cereshop/business/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.business.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-business/src/main/java/com/shop/cereshop/business/service/logistics/impl/CereOrderLogisticsServiceImpl.java b/cereshop-business/src/main/java/com/shop/cereshop/business/service/logistics/impl/CereOrderLogisticsServiceImpl.java index 731b715..892d223 100644 --- a/cereshop-business/src/main/java/com/shop/cereshop/business/service/logistics/impl/CereOrderLogisticsServiceImpl.java +++ b/cereshop-business/src/main/java/com/shop/cereshop/business/service/logistics/impl/CereOrderLogisticsServiceImpl.java @@ -54,6 +54,8 @@ public class CereOrderLogisticsServiceImpl implements CereOrderLogisticsService cereOrderLogistics.setChargeType(param.getChargeType()); cereOrderLogistics.setCreateTime(time); cereOrderLogistics.setShopId(param.getShopId()); + cereOrderLogistics.setStorehouseId(param.getStorehouseId()); + //新增物流方案 cereOrderLogisticsDAO.insert(cereOrderLogistics); //新增计费明细数据 @@ -85,6 +87,7 @@ public class CereOrderLogisticsServiceImpl implements CereOrderLogisticsService cereOrderLogistics.setChargeType(param.getChargeType()); cereOrderLogistics.setUpdateTime(time); cereOrderLogistics.setShopId(param.getShopId()); + cereOrderLogistics.setStorehouseId(param.getStorehouseId()); cereOrderLogisticsDAO.updateByPrimaryKeySelective(cereOrderLogistics); //清空计费明细 cereLogisticsChargeService.deleteByLogisticsId(param.getLogisticsId()); diff --git a/cereshop-business/src/main/java/com/shop/cereshop/business/service/product/impl/CereShopProductServiceImpl.java b/cereshop-business/src/main/java/com/shop/cereshop/business/service/product/impl/CereShopProductServiceImpl.java index 1004a1c..56154fe 100644 --- a/cereshop-business/src/main/java/com/shop/cereshop/business/service/product/impl/CereShopProductServiceImpl.java +++ b/cereshop-business/src/main/java/com/shop/cereshop/business/service/product/impl/CereShopProductServiceImpl.java @@ -722,6 +722,7 @@ public class CereShopProductServiceImpl implements CereShopProductService { } cereProductSku.setOriginalPrice(sku.getOriginalPrice()); cereProductSku.setPrice(sku.getPrice()); + cereProductSku.setRate(sku.getRate()); cereProductSku.setSkuImage(sku.getSkuImage()); cereProductSku.setSKU(sku.getSku()); cereProductSku.setStockNumber(sku.getStockNumber()); diff --git a/cereshop-business/src/main/resources/mybatis/mapper/logistics/CereOrderLogisticsDAO.xml b/cereshop-business/src/main/resources/mybatis/mapper/logistics/CereOrderLogisticsDAO.xml index a9aabe2..31afdb1 100644 --- a/cereshop-business/src/main/resources/mybatis/mapper/logistics/CereOrderLogisticsDAO.xml +++ b/cereshop-business/src/main/resources/mybatis/mapper/logistics/CereOrderLogisticsDAO.xml @@ -4,14 +4,14 @@ + - - logistics_id,shop_id, logistics_name, charge_type, create_time, update_time + logistics_id,shop_id, storehouse_id, logistics_name, charge_type, create_time, update_time - SELECT logistics_id,logistics_name,charge_type FROM cere_order_logistics where logistics_id=#{logisticsId} + SELECT + col.logistics_id, + col.storehouse_id, + css.storehouse_name, + col.logistics_name, + col.charge_type + FROM cere_order_logistics col + LEFT JOIN cere_shop_storehouse css ON css.storehouse_id = col.storehouse_id + where col.logistics_id=#{logisticsId} @@ -47,6 +49,12 @@ original_price, + + rate, + + + storehouse_id, + stock_number, @@ -82,6 +90,12 @@ #{originalPrice,jdbcType=DECIMAL}, + + #{rate,jdbcType=DECIMAL}, + + + #{storehouseId,jdbcType=BIGINT}, + #{stockNumber,jdbcType=INTEGER}, @@ -120,6 +134,9 @@ original_price = #{originalPrice,jdbcType=DECIMAL}, + + rate = #{rate,jdbcType=DECIMAL}, + is_cross = #{isCross,jdbcType=BIT}, @@ -156,6 +173,8 @@ SKU = #{SKU,jdbcType=VARCHAR}, price = #{price,jdbcType=DECIMAL}, original_price = #{originalPrice,jdbcType=DECIMAL}, + rate = #{rate,jdbcType=DECIMAL}, + storehouse_id = #{storehouseId,jdbcType=BIGINT}, stock_number = #{stockNumber,jdbcType=INTEGER}, total = #{total,jdbcType=INTEGER}, weight = #{weight,jdbcType=DECIMAL}, @@ -168,7 +187,7 @@ insert into cere_product_sku (product_id, sku_name, sku_value, - price, original_price, stock_number, + price, original_price, rate, storehouse_id, stock_number, weight, sku_image, `style`, create_time) values @@ -178,6 +197,8 @@ #{item.skuValue}, #{item.price}, #{item.originalPrice}, + #{item.rate}, + #{item.storehouseId}, #{item.stockNumber}, #{item.weight}, #{item.skuImage}, @@ -207,6 +228,7 @@ sku_id, price, original_price, + rate, storehouse_id, is_cross, stock_number, @@ -238,6 +260,8 @@ c.product_name, IF(b.image IS NULL, d.product_image, b.image) image, a.original_price, + a.rate, + a.storehouse_id, a.stock_number, b.`value` from cere_product_sku a diff --git a/cereshop-business/src/main/resources/mybatis/mapper/tool/CereShopDiscountDAO.xml b/cereshop-business/src/main/resources/mybatis/mapper/tool/CereShopDiscountDAO.xml index cc9a040..8636f4e 100644 --- a/cereshop-business/src/main/resources/mybatis/mapper/tool/CereShopDiscountDAO.xml +++ b/cereshop-business/src/main/resources/mybatis/mapper/tool/CereShopDiscountDAO.xml @@ -413,7 +413,7 @@ update cere_shop_discount SET state=2,update_time=#{time} where shop_discount_id in ( - #{item.discountId} + #{item.shopDiscountId} ) diff --git a/cereshop-commons/src/main/java/com/shop/cereshop/commons/config/CrossStockConfig.java b/cereshop-commons/src/main/java/com/shop/cereshop/commons/config/CrossStockConfig.java new file mode 100644 index 0000000..dee7ea9 --- /dev/null +++ b/cereshop-commons/src/main/java/com/shop/cereshop/commons/config/CrossStockConfig.java @@ -0,0 +1,41 @@ +/* + * Copyright (C) 2017-2021 + * All rights reserved, Designed By 深圳中科鑫智科技有限公司 + * Copyright authorization contact 18814114118 + */ +package com.shop.cereshop.commons.config; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; + +@Component +public class CrossStockConfig { + + public static String URL = "http://47.112.3.12:8288"; + + public static String APPTOKEN = "ad523693d56243dc87e820bd44e18da1"; + + // 加密key + public static String APPKEY = "4d6e1cf9dbb24dc78c3c4d24db021333"; + + + @Value("${crossstock.url:}") + public void setUrl(String url) { + this.URL = url; + } + + + @Value("${crossstock.appToken:}") + public void setToken(String appToken) { + this.APPTOKEN = appToken; + } + + @Value("${crossstock.appKey:}") + public void setAppKey(String appKey) { + this.APPKEY = appKey; + } + + public static String getApiUrl(String apiUrlPath){ + return URL + "/" + apiUrlPath + "?apptoken=" + APPTOKEN + "&appkey=" + APPKEY; + } +} diff --git a/cereshop-commons/src/main/java/com/shop/cereshop/commons/config/HuaxunConfig.java b/cereshop-commons/src/main/java/com/shop/cereshop/commons/config/HuaxunConfig.java index ec63de1..29b20ff 100644 --- a/cereshop-commons/src/main/java/com/shop/cereshop/commons/config/HuaxunConfig.java +++ b/cereshop-commons/src/main/java/com/shop/cereshop/commons/config/HuaxunConfig.java @@ -5,16 +5,41 @@ */ package com.shop.cereshop.commons.config; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; @Component public class HuaxunConfig { // 加密key + private static String URL = "https://bg.qdhuaxun.cn/index.php"; + + // 加密key + private static String APPID = "8bd29f557af22ec4062774"; + + // 加密key public static String KEY = "alexyu01"; - // PAY_URL - public static String PAY_URL = "https://bg.qdhuaxun.cn/index.php?r=paybaoguan.api.pay&appid=8bd29f557af22ec4062774"; - // PAYBACK_URL - public static String PAYBACK_URL = "https://bg.qdhuaxun.cn/index.php?r=paybaoguan.api.payback&appid=8bd29f557af22ec4062774"; + @Value("${huaxun.url:}") + public void setUrl(String url) { + this.URL = url; + } + + @Value("${huaxun.appId:}") + public void setAppId(String appId) { + this.APPID = appId; + } + + @Value("${huaxun.key:}") + public void setKey(String key) { + this.KEY = key; + } + + public static String getPayUrl(){ + return HuaxunConfig.URL + "?r=paybaoguan.api.pay&appid=" + HuaxunConfig.APPID; + } + + public static String getPayBackUrl(){ + return HuaxunConfig.URL + "?r=paybaoguan.api.payback&appid=" + HuaxunConfig.APPID; + } } diff --git a/cereshop-commons/src/main/java/com/shop/cereshop/commons/constant/CoReturnFormat.java b/cereshop-commons/src/main/java/com/shop/cereshop/commons/constant/CoReturnFormat.java index 6a99b3e..19d7cf1 100644 --- a/cereshop-commons/src/main/java/com/shop/cereshop/commons/constant/CoReturnFormat.java +++ b/cereshop-commons/src/main/java/com/shop/cereshop/commons/constant/CoReturnFormat.java @@ -245,6 +245,7 @@ public class CoReturnFormat { put(CoReturnFormat.SHOP_COUPON_EXPIRED, "商家优惠券已过期"); put(CoReturnFormat.SHOP_COUPON_ABNORMAL, "商家优惠券状态异常"); put(CoReturnFormat.CHANNEL_COUPON_SOLD_OUT_OR_END, "优惠券已领完或活动已结束"); + put(CoReturnFormat.COUPON_ALREADY_USE, "优惠券重复使用,请重新选择优惠券"); //================================ 平台 ================================== @@ -675,6 +676,8 @@ public class CoReturnFormat { /** 优惠券已领完或活动已结束 */ public static final String CHANNEL_COUPON_SOLD_OUT_OR_END = "700010"; + public static final String COUPON_ALREADY_USE = "700011"; + //================================ 平台 ================================== /** 该类型画布已存在,请修改*/ public static final String CANVAS_ALREADY= "800001"; diff --git a/cereshop-commons/src/main/java/com/shop/cereshop/commons/domain/logistics/CereOrderLogistics.java b/cereshop-commons/src/main/java/com/shop/cereshop/commons/domain/logistics/CereOrderLogistics.java index b6d430b..40d6546 100644 --- a/cereshop-commons/src/main/java/com/shop/cereshop/commons/domain/logistics/CereOrderLogistics.java +++ b/cereshop-commons/src/main/java/com/shop/cereshop/commons/domain/logistics/CereOrderLogistics.java @@ -29,6 +29,11 @@ public class CereOrderLogistics implements Serializable { private Long shopId; /** + * 仓库id + */ + private Long storehouseId; + + /** * 方案名称 */ private String logisticsName; diff --git a/cereshop-commons/src/main/java/com/shop/cereshop/commons/domain/order/CereOrderProduct.java b/cereshop-commons/src/main/java/com/shop/cereshop/commons/domain/order/CereOrderProduct.java index 45a5c9d..1f75335 100644 --- a/cereshop-commons/src/main/java/com/shop/cereshop/commons/domain/order/CereOrderProduct.java +++ b/cereshop-commons/src/main/java/com/shop/cereshop/commons/domain/order/CereOrderProduct.java @@ -57,7 +57,7 @@ public class CereOrderProduct implements Serializable { private BigDecimal productPrice; /** - * 该sku实际总支付加个(不包含运费和积分) + * 该sku实际总支付价格(不包含运费和积分) */ private BigDecimal actualPrice; diff --git a/cereshop-commons/src/main/java/com/shop/cereshop/commons/domain/order/CereShopOrder.java b/cereshop-commons/src/main/java/com/shop/cereshop/commons/domain/order/CereShopOrder.java index 026c636..51da8d0 100644 --- a/cereshop-commons/src/main/java/com/shop/cereshop/commons/domain/order/CereShopOrder.java +++ b/cereshop-commons/src/main/java/com/shop/cereshop/commons/domain/order/CereShopOrder.java @@ -8,6 +8,7 @@ package com.shop.cereshop.commons.domain.order; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.shop.cereshop.commons.utils.EmptyUtils; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; @@ -241,6 +242,11 @@ public class CereShopOrder implements Serializable { */ private BigDecimal pricingPrice; + /** + * 是否是跨境订单 + */ + private Integer isCross; + private static final long serialVersionUID = 1L; } diff --git a/cereshop-commons/src/main/java/com/shop/cereshop/commons/domain/product/CereProductSku.java b/cereshop-commons/src/main/java/com/shop/cereshop/commons/domain/product/CereProductSku.java index 5ee60ba..edc2372 100644 --- a/cereshop-commons/src/main/java/com/shop/cereshop/commons/domain/product/CereProductSku.java +++ b/cereshop-commons/src/main/java/com/shop/cereshop/commons/domain/product/CereProductSku.java @@ -56,6 +56,12 @@ public class CereProductSku implements Serializable { private BigDecimal originalPrice; /** + * 税率 + */ + @ApiModelProperty(value = "税率") + private BigDecimal rate; + + /** * * 所属仓库 */ @ApiModelProperty(value = "所属仓库")