diff --git a/fightwine-common/src/main/java/com/yzt/common/vo/SystemStoreNearVo.java b/fightwine-common/src/main/java/com/yzt/common/vo/SystemStoreNearVo.java index 4223747..76d5e04 100644 --- a/fightwine-common/src/main/java/com/yzt/common/vo/SystemStoreNearVo.java +++ b/fightwine-common/src/main/java/com/yzt/common/vo/SystemStoreNearVo.java @@ -19,7 +19,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName("fw_system_store") +@TableName("zp_system_store") @ApiModel(value="SystemStoreNearVo对象", description="门店自提") public class SystemStoreNearVo implements Serializable { diff --git a/fightwine-service/src/main/resources/mapper/express/ShippingTemplatesFreeMapper.xml b/fightwine-service/src/main/resources/mapper/express/ShippingTemplatesFreeMapper.xml index e7c3a59..5c288e4 100644 --- a/fightwine-service/src/main/resources/mapper/express/ShippingTemplatesFreeMapper.xml +++ b/fightwine-service/src/main/resources/mapper/express/ShippingTemplatesFreeMapper.xml @@ -4,7 +4,7 @@ diff --git a/fightwine-service/src/main/resources/mapper/express/ShippingTemplatesRegionMapper.xml b/fightwine-service/src/main/resources/mapper/express/ShippingTemplatesRegionMapper.xml index b4f0b01..3448acf 100644 --- a/fightwine-service/src/main/resources/mapper/express/ShippingTemplatesRegionMapper.xml +++ b/fightwine-service/src/main/resources/mapper/express/ShippingTemplatesRegionMapper.xml @@ -4,7 +4,7 @@ - select sum(price) as price from fw_user_recharge + select sum(price) as price from zp_user_recharge where paid = 1 and recharge_type = #{type, jdbcType=VARCHAR} @@ -11,7 +11,7 @@ diff --git a/fightwine-service/src/main/resources/mapper/marketing/StoreCouponUserMapper.xml b/fightwine-service/src/main/resources/mapper/marketing/StoreCouponUserMapper.xml index 73e71e7..238eef4 100644 --- a/fightwine-service/src/main/resources/mapper/marketing/StoreCouponUserMapper.xml +++ b/fightwine-service/src/main/resources/mapper/marketing/StoreCouponUserMapper.xml @@ -5,7 +5,7 @@ - select IFNULL(sum(pay_num), 0) as pay_num from fw_store_order_info - where order_id in (SELECT id FROM `fw_store_order` where paid = 1 and date_format(create_time, '%Y-%m-%d') = #{date}) + select IFNULL(sum(pay_num), 0) as pay_num from zp_store_order_info + where order_id in (SELECT id FROM `zp_store_order` where paid = 1 and date_format(create_time, '%Y-%m-%d') = #{date}) and product_id = #{proId} diff --git a/fightwine-service/src/main/resources/mapper/store/StoreOrderStatusMapper.xml b/fightwine-service/src/main/resources/mapper/store/StoreOrderStatusMapper.xml index bce6afc..5ff4074 100644 --- a/fightwine-service/src/main/resources/mapper/store/StoreOrderStatusMapper.xml +++ b/fightwine-service/src/main/resources/mapper/store/StoreOrderStatusMapper.xml @@ -3,8 +3,8 @@ diff --git a/fightwine-service/src/main/resources/mapper/store/StorePinkMapper.xml b/fightwine-service/src/main/resources/mapper/store/StorePinkMapper.xml index 8d32946..e2fcade 100644 --- a/fightwine-service/src/main/resources/mapper/store/StorePinkMapper.xml +++ b/fightwine-service/src/main/resources/mapper/store/StorePinkMapper.xml @@ -7,10 +7,10 @@ p.id, p.uid, p.order_id, p.order_id_key, p.total_num, p.total_price, p.cid, p.pid, p.people, p.price, p.add_time, p.stop_time, p.k_id, p.is_tpl, p.is_refund, p.status, p.nickname, p.avatar, p.is_virtual - FROM fw_store_pink p + FROM zp_store_pink p INNER JOIN ( SELECT uid, MAX(id) AS max_id - FROM fw_store_pink + FROM zp_store_pink WHERE is_refund = 'false' AND status IN (1, 2) GROUP BY uid ) AS tmp ON p.uid = tmp.uid AND p.id = tmp.max_id diff --git a/fightwine-service/src/main/resources/mapper/store/StoreProductAttrMapper.xml b/fightwine-service/src/main/resources/mapper/store/StoreProductAttrMapper.xml index 864cea9..f720abd 100644 --- a/fightwine-service/src/main/resources/mapper/store/StoreProductAttrMapper.xml +++ b/fightwine-service/src/main/resources/mapper/store/StoreProductAttrMapper.xml @@ -2,7 +2,7 @@ - update fw_store_product_attr + update zp_store_product_attr attr_name = #{ attrName }, attr_values = #{ attrValues }, diff --git a/fightwine-service/src/main/resources/mapper/store/StoreProductRelationMapper.xml b/fightwine-service/src/main/resources/mapper/store/StoreProductRelationMapper.xml index 06859e2..c4f3e18 100644 --- a/fightwine-service/src/main/resources/mapper/store/StoreProductRelationMapper.xml +++ b/fightwine-service/src/main/resources/mapper/store/StoreProductRelationMapper.xml @@ -4,8 +4,8 @@ SELECT m.* - FROM fw_system_menu m - right join fw_system_role_menu rm on rm.menu_id = m.id - right join fw_system_role r on rm.rid = r.id - right join fw_system_admin a on FIND_IN_SET(r.id, a.roles) + FROM zp_system_menu m + right join zp_system_role_menu rm on rm.menu_id = m.id + right join zp_system_role r on rm.rid = r.id + right join zp_system_admin a on FIND_IN_SET(r.id, a.roles) where m.is_delte = 0 and r.`status` = 1 and a.id = #{userId} GROUP BY m.id diff --git a/fightwine-service/src/main/resources/mapper/system/SystemPermissionsMapper.xml b/fightwine-service/src/main/resources/mapper/system/SystemPermissionsMapper.xml index 14bdde0..f80a9b2 100644 --- a/fightwine-service/src/main/resources/mapper/system/SystemPermissionsMapper.xml +++ b/fightwine-service/src/main/resources/mapper/system/SystemPermissionsMapper.xml @@ -4,10 +4,10 @@ diff --git a/fightwine-service/src/main/resources/mapper/system/SystemStoreMapper.xml b/fightwine-service/src/main/resources/mapper/system/SystemStoreMapper.xml index 32e5740..362543f 100644 --- a/fightwine-service/src/main/resources/mapper/system/SystemStoreMapper.xml +++ b/fightwine-service/src/main/resources/mapper/system/SystemStoreMapper.xml @@ -4,7 +4,7 @@ diff --git a/fightwine-service/src/main/resources/mapper/user/UserBillMapper.xml b/fightwine-service/src/main/resources/mapper/user/UserBillMapper.xml index 809c31f..0b55925 100644 --- a/fightwine-service/src/main/resources/mapper/user/UserBillMapper.xml +++ b/fightwine-service/src/main/resources/mapper/user/UserBillMapper.xml @@ -3,8 +3,8 @@