From 616f4dfb1a62754f720cfdd0f46805f10f275b9a Mon Sep 17 00:00:00 2001 From: zhh Date: Tue, 28 Aug 2018 14:36:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E8=B4=A7=E5=9C=B0=E5=9D=80=E7=AE=A1?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- document/pdm/mall.pdb | 8 +- document/pdm/mall.pdm | 688 +++++++++--------- .../mall/model/UmsMemberReceiveAddress.java | 76 +- .../model/UmsMemberReceiveAddressExample.java | 326 +++++++-- .../mapper/UmsMemberReceiveAddressMapper.xml | 98 ++- .../mall/portal/config/SecurityConfig.java | 4 +- .../UmsMemberReceiveAddressController.java | 72 ++ .../UmsMemberReceiveAddressService.java | 40 + .../UmsMemberReceiveAddressServiceImpl.java | 68 ++ 9 files changed, 951 insertions(+), 429 deletions(-) create mode 100644 mall-portal/src/main/java/com/macro/mall/portal/controller/UmsMemberReceiveAddressController.java create mode 100644 mall-portal/src/main/java/com/macro/mall/portal/service/UmsMemberReceiveAddressService.java create mode 100644 mall-portal/src/main/java/com/macro/mall/portal/service/impl/UmsMemberReceiveAddressServiceImpl.java diff --git a/document/pdm/mall.pdb b/document/pdm/mall.pdb index 571d21b..3d6d685 100644 --- a/document/pdm/mall.pdb +++ b/document/pdm/mall.pdb @@ -1,5 +1,5 @@ - + @@ -13158,11 +13158,11 @@ LABL 0 新宋体,8,N 4EDEC710-4328-4BF8-BCCC-EA8EAAA48FF1 -address -address +detail_address +detail_address 1522390108 zhenghong -1522390238 +1535436964 zhenghong 收货地址 varchar(128) diff --git a/document/pdm/mall.pdm b/document/pdm/mall.pdm index 571d21b..2524dc1 100644 --- a/document/pdm/mall.pdm +++ b/document/pdm/mall.pdm @@ -1,5 +1,5 @@ - + @@ -6718,9 +6718,9 @@ LABL 0 新宋体,8,N 1522390106 -1522398598 +1535437026 -1 -((20171,51258), (33405,58456)) +((20171,50021), (33405,59693)) 12615680 16570034 12632256 @@ -13106,7 +13106,7 @@ LABL 0 新宋体,8,N ums_member_receive_address 1522390106 zhenghong -1522390434 +1535437101 zhenghong 会员收货地址表 @@ -13157,16 +13157,16 @@ LABL 0 新宋体,8,N 64 -4EDEC710-4328-4BF8-BCCC-EA8EAAA48FF1 -address -address -1522390108 +2D383AAE-D002-480B-B081-4ABB9A0FE45F +default_status +default_status +1522390286 zhenghong -1522390238 +1522390346 zhenghong -收货地址 -varchar(128) -128 +是否为默认 +int(1) +1 013038D3-3265-4B47-AA73-C893A6006BD8 @@ -13181,20 +13181,56 @@ LABL 0 新宋体,8,N 100 -2D383AAE-D002-480B-B081-4ABB9A0FE45F -default_status -default_status -1522390286 +214E7869-4680-4DDC-A4AF-611BDB9DB594 +province +province +1535436971 zhenghong -1522390346 +1535437029 zhenghong -是否为默认 -int(1) -1 +省份/直辖市 +varchar(100) +100 + + +B014298F-01AD-4171-9D9F-916D27574AB6 +city +city +1535436971 +zhenghong +1535437115 +zhenghong +城市 +varchar(100) +100 + + +106C677E-A9B6-40ED-A992-CD0CADF4BFFF +region +region +1535437026 +zhenghong +1535437123 +zhenghong + +varchar(100) +100 + + +4EDEC710-4328-4BF8-BCCC-EA8EAAA48FF1 +detail_address +detail_address +1522390108 +zhenghong +1535436990 +zhenghong +详细地址(街道) +varchar(128) +128 - + DF83812C-9AB1-43B1-9C66-06DDD339917E Key_1 Key_1 @@ -13208,7 +13244,7 @@ LABL 0 新宋体,8,N - + @@ -13222,7 +13258,7 @@ LABL 0 新宋体,8,N 会员登录记录 - + 4B9B3F0B-970F-4BD2-ADA9-9B5AF12CB5AB id id @@ -13234,7 +13270,7 @@ LABL 0 新宋体,8,N 1 1 - + 96996021-E445-4698-B1A6-42E723CA01EF member_id member_id @@ -13244,7 +13280,7 @@ LABL 0 新宋体,8,N zhenghong bigint - + D5AD4C5C-E858-4BA3-8DB3-741A4D6D780C create_time create_time @@ -13254,7 +13290,7 @@ LABL 0 新宋体,8,N zhenghong datetime - + EA660841-B4C3-4D58-BA70-765F688BBFB9 ip ip @@ -13265,7 +13301,7 @@ LABL 0 新宋体,8,N varchar(64) 64 - + 4129F50F-3EB2-402A-8239-25FB68B06BE1 city city @@ -13276,7 +13312,7 @@ LABL 0 新宋体,8,N varchar(64) 64 - + 9C080457-2FBF-4EEA-B7DF-B465681C679C login_type login_type @@ -13288,7 +13324,7 @@ LABL 0 新宋体,8,N int(1) 1 - + 026D0B9F-44F5-4302-8766-551E0CBA48E2 province province @@ -13301,7 +13337,7 @@ LABL 0 新宋体,8,N - + EC511DBF-DA00-49B0-9DD3-AE6E4E18496A Key_1 Key_1 @@ -13310,12 +13346,12 @@ LABL 0 新宋体,8,N 1522390531 zhenghong - + - + @@ -13329,7 +13365,7 @@ LABL 0 新宋体,8,N 用户标签表 - + 438F1497-2B84-4368-AE85-9E1806F36FC9 id id @@ -13341,7 +13377,7 @@ LABL 0 新宋体,8,N 1 1 - + 96FB084C-E214-4481-95FD-52FF9AF5C1FA name name @@ -13352,7 +13388,7 @@ LABL 0 新宋体,8,N varchar(100) 100 - + C727F26A-5CFA-4C30-9EE3-A5F87998DE9E finish_order_count finish_order_count @@ -13363,7 +13399,7 @@ LABL 0 新宋体,8,N 自动打标签完成订单数量 int - + 148613FB-7BCE-4145-B955-B0077E630B6E finish_order_amount finish_order_amount @@ -13378,7 +13414,7 @@ LABL 0 新宋体,8,N - + 02E5405B-3466-42C6-B07B-090E17D190BA Key_1 Key_1 @@ -13387,12 +13423,12 @@ LABL 0 新宋体,8,N 1522390854 zhenghong - + - + @@ -13406,7 +13442,7 @@ LABL 0 新宋体,8,N 用户和标签关系表 - + BB1BD091-E5C8-4C12-8A9A-C2ADC962E7E5 id id @@ -13418,7 +13454,7 @@ LABL 0 新宋体,8,N 1 1 - + 854EDA6D-D3FB-4AFF-92AD-1FDF1DC32E1E member_id member_id @@ -13428,7 +13464,7 @@ LABL 0 新宋体,8,N zhenghong bigint - + 89D08954-C6F1-4B1F-8BAE-E19BDF39DE08 tag_id tag_id @@ -13440,7 +13476,7 @@ LABL 0 新宋体,8,N - + AEBACA14-2E96-4718-ACE9-C6F76721B8E8 Key_1 Key_1 @@ -13449,12 +13485,12 @@ LABL 0 新宋体,8,N 1522391349 zhenghong - + - + @@ -13468,7 +13504,7 @@ LABL 0 新宋体,8,N 积分变化历史记录表 - + 457FA52E-BCCD-40B6-9595-2597CD6C75E2 id id @@ -13480,7 +13516,7 @@ LABL 0 新宋体,8,N 1 1 - + 9964C6D5-F7BD-40FB-957B-7A66DFF172A4 member_id member_id @@ -13490,7 +13526,7 @@ LABL 0 新宋体,8,N zhenghong bigint - + BCF4B5AF-DEA0-4D46-8A23-E5348BF281C8 create_time create_time @@ -13500,7 +13536,7 @@ LABL 0 新宋体,8,N zhenghong datetime - + 52CE81B5-6BDF-40F0-97BA-2DC303583FF4 change_type change_type @@ -13512,7 +13548,7 @@ LABL 0 新宋体,8,N int(1) 1 - + 6D9BAE2A-F62A-4DA0-B9B4-AD3695E3ADEC change_count change_count @@ -13523,7 +13559,7 @@ LABL 0 新宋体,8,N 积分改变数量 int - + E63C6C7E-249C-4653-AF54-3DF677FF8B65 operate_man operate_man @@ -13535,7 +13571,7 @@ LABL 0 新宋体,8,N varchar(100) 100 - + 079B7A28-0F20-4439-934B-AC8ABA31B76A operate_note operate_note @@ -13547,7 +13583,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + A51DAFDF-D7E9-403D-A31F-7341E809448F source_type source_type @@ -13561,7 +13597,7 @@ LABL 0 新宋体,8,N - + A0C0BBC3-CBCB-4FD0-A047-91D827AFA920 Key_1 Key_1 @@ -13570,12 +13606,12 @@ LABL 0 新宋体,8,N 1522396491 zhenghong - + - + @@ -13589,7 +13625,7 @@ LABL 0 新宋体,8,N 成长值变化历史记录表 - + 0161A828-441F-4CAB-90F0-2FC4EF6A6B3F id id @@ -13601,7 +13637,7 @@ LABL 0 新宋体,8,N 1 1 - + B546E2F7-48AB-4A7C-A4A0-28A667D75391 member_id member_id @@ -13611,7 +13647,7 @@ LABL 0 新宋体,8,N zhenghong bigint - + D33F598C-18B5-4DF4-8326-FF7328B10F00 create_time create_time @@ -13621,7 +13657,7 @@ LABL 0 新宋体,8,N zhenghong datetime - + A0377031-7298-442C-B4DF-94C554828629 change_type change_type @@ -13633,7 +13669,7 @@ LABL 0 新宋体,8,N int(1) 1 - + 0EF45C85-5160-4E92-A3A6-C4B546D93214 change_count change_count @@ -13644,7 +13680,7 @@ LABL 0 新宋体,8,N 积分改变数量 int - + 4893755C-D937-4D36-9611-B9AD46A57BAA operate_man operate_man @@ -13656,7 +13692,7 @@ LABL 0 新宋体,8,N varchar(100) 100 - + 6CA349B8-491B-4E27-880E-D83491AB7849 operate_note operate_note @@ -13668,7 +13704,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + 52268506-CE01-481B-ABD3-F84E4E9758C9 source_type source_type @@ -13682,7 +13718,7 @@ LABL 0 新宋体,8,N - + 2BAA5513-B2CF-4B60-A990-6319EB2671C4 Key_1 Key_1 @@ -13691,12 +13727,12 @@ LABL 0 新宋体,8,N 1522396809 zhenghong - + - + @@ -13710,7 +13746,7 @@ LABL 0 新宋体,8,N 会员任务表 - + 56B17C0E-8FBA-4594-8C45-1FF6469A7159 id id @@ -13722,7 +13758,7 @@ LABL 0 新宋体,8,N 1 1 - + 65D902D3-95D4-4540-BC18-F384B3710D83 name name @@ -13733,7 +13769,7 @@ LABL 0 新宋体,8,N varchar(100) 100 - + 20EF2EF9-E621-4652-B334-862949676CA3 growth growth @@ -13744,7 +13780,7 @@ LABL 0 新宋体,8,N 赠送成长值 int - + 55E587FF-CF0D-45D0-B63D-171E313D0FEB intergration intergration @@ -13755,7 +13791,7 @@ LABL 0 新宋体,8,N 赠送积分 int - + 6878B9A3-18D2-4405-97D4-B3BE49EBA993 type type @@ -13769,7 +13805,7 @@ LABL 0 新宋体,8,N - + EA426689-78F7-40C2-B520-83BA9FCC54D1 Key_1 Key_1 @@ -13778,12 +13814,12 @@ LABL 0 新宋体,8,N 1522397207 zhenghong - + - + @@ -13797,7 +13833,7 @@ LABL 0 新宋体,8,N 会员积分成长规则表 - + 125CFE60-6A33-4680-B726-FC5E68082C98 id id @@ -13809,7 +13845,7 @@ LABL 0 新宋体,8,N 1 1 - + 38E3DC37-0559-41F6-84C0-3F5C43C48FF0 continue_sign_day continue_sign_day @@ -13820,7 +13856,7 @@ LABL 0 新宋体,8,N 连续签到天数 int - + 9508FDB7-6018-4E59-A007-49274C4627DC continue_sign_point continue_sign_point @@ -13831,7 +13867,7 @@ LABL 0 新宋体,8,N 连续签到赠送数量 int - + 2D67D7C4-242F-4287-AE03-819499C5EEE9 consume_per_point consume_per_point @@ -13844,7 +13880,7 @@ LABL 0 新宋体,8,N 10 2 - + 3099A480-47E9-45F0-9183-7884D0C8B799 low_order_amount low_order_amount @@ -13857,7 +13893,7 @@ LABL 0 新宋体,8,N 10 2 - + 10ECB92A-03AE-4EC0-9F92-D4693B754400 max_point_per_order max_point_per_order @@ -13868,7 +13904,7 @@ LABL 0 新宋体,8,N 每笔订单最高获取点数 int - + BBA261DE-035F-41ED-96F8-64CF61B19EB8 type type @@ -13882,7 +13918,7 @@ LABL 0 新宋体,8,N - + B72372E9-CEF8-4759-A874-B60E418F73DE Key_1 Key_1 @@ -13891,12 +13927,12 @@ LABL 0 新宋体,8,N 1522397551 zhenghong - + - + @@ -13910,7 +13946,7 @@ LABL 0 新宋体,8,N 积分消费设置 - + 5A65A4E0-C798-494B-89AA-899A5FE7ECC3 id id @@ -13922,7 +13958,7 @@ LABL 0 新宋体,8,N 1 1 - + E5B7DEEB-C659-43D6-A649-4A7AA6BA968A deduction_per_amount deduction_per_amount @@ -13933,7 +13969,7 @@ LABL 0 新宋体,8,N 每一元需要抵扣的积分数量 int - + 3F3EBC7E-C661-4BF6-9748-A63740946E37 max_percent_per_order max_percent_per_order @@ -13944,7 +13980,7 @@ LABL 0 新宋体,8,N 每笔订单最高抵用百分比 int - + A51ACE1C-D2CC-4935-AEEE-392472F47BA1 use_unit use_unit @@ -13955,7 +13991,7 @@ LABL 0 新宋体,8,N 每次使用积分最小单位100 int - + 381B38BC-D7D6-44F6-8E9A-7EC3ED2D96C3 coupon_status coupon_status @@ -13969,7 +14005,7 @@ LABL 0 新宋体,8,N - + E57C57B8-9833-47BB-905A-F54F0A5010DA Key_1 Key_1 @@ -13978,12 +14014,12 @@ LABL 0 新宋体,8,N 1522398071 zhenghong - + - + @@ -13997,7 +14033,7 @@ LABL 0 新宋体,8,N 订单表 - + 3563269E-6EED-49DE-AC40-20CDE76A70F7 id id @@ -14010,7 +14046,7 @@ LABL 0 新宋体,8,N 1 1 - + 1BFDD362-9A3F-4A39-A46A-988EFE0700F4 member_id member_id @@ -14020,7 +14056,7 @@ LABL 0 新宋体,8,N zhenghong bigint - + 7A1BB5A1-6ACE-4259-9D2F-A11D74465729 coupon_id coupon_id @@ -14030,7 +14066,7 @@ LABL 0 新宋体,8,N zhenghong bigint - + 190337D5-DBCF-44C7-8E8F-60BA716C7D73 order_sn order_sn @@ -14042,7 +14078,7 @@ LABL 0 新宋体,8,N varchar(64) 64 - + 42DE6A32-DB28-4441-9D31-43954E2B32F8 create_time create_time @@ -14053,7 +14089,7 @@ LABL 0 新宋体,8,N 提交时间 datetime - + B66D00FB-2706-4456-9C8D-5BE63900E843 member_username member_username @@ -14065,7 +14101,7 @@ LABL 0 新宋体,8,N varchar(64) 64 - + 93AF6B00-CE9F-4E65-852A-21DF3E8E38D3 total_amount total_amount @@ -14078,7 +14114,7 @@ LABL 0 新宋体,8,N 10 2 - + 93484605-04CB-4451-BA1C-1D43843E1FE8 freight_amount freight_amount @@ -14091,7 +14127,7 @@ LABL 0 新宋体,8,N 10 2 - + 31D4C71F-D7FF-4C00-88F3-D1A8B195D948 promotion_amount promotion_amount @@ -14104,7 +14140,7 @@ LABL 0 新宋体,8,N 10 2 - + 2AC97908-B95C-4C45-AD78-5AEBD42D415E integration_amount integration_amount @@ -14117,7 +14153,7 @@ LABL 0 新宋体,8,N 10 2 - + BDECF3D8-B85D-459A-9336-D298B11A129C coupon_amount coupon_amount @@ -14130,7 +14166,7 @@ LABL 0 新宋体,8,N 10 2 - + 570A30CB-E74E-4D54-A2F5-354511EEAD73 discount_amount discount_amount @@ -14143,7 +14179,7 @@ LABL 0 新宋体,8,N 10 2 - + 2506F5AD-C896-45DA-B1A9-47A3F09F32A7 pay_type pay_type @@ -14155,7 +14191,7 @@ LABL 0 新宋体,8,N int(1) 1 - + 1E796BD6-898E-4EDA-8ADE-A86D6305ED56 source_type source_type @@ -14167,7 +14203,7 @@ LABL 0 新宋体,8,N int(1) 1 - + EBDE3354-1D7D-43AF-ADC1-D73233AF9967 status status @@ -14179,7 +14215,7 @@ LABL 0 新宋体,8,N int(1) 1 - + 17C117FA-5488-480A-98AD-35E18E6B084D order_type order_type @@ -14191,7 +14227,7 @@ LABL 0 新宋体,8,N int(1) 1 - + 61822C95-27AC-4143-8C5F-CDE6DFE15B2C delivery_company delivery_company @@ -14203,7 +14239,7 @@ LABL 0 新宋体,8,N varchar(64) 64 - + 91DA7F9F-8F28-4D16-8A89-1379C5141304 delivery_sn delivery_sn @@ -14215,7 +14251,7 @@ LABL 0 新宋体,8,N varchar(64) 64 - + ACB792D2-4ED5-47EE-BAFD-C389DAAA07E3 auto_confirm_day auto_confirm_day @@ -14226,7 +14262,7 @@ LABL 0 新宋体,8,N 自动确认时间(天) int - + C142CF56-1ED7-4D71-95DF-9F114248A7BC integration integration @@ -14237,7 +14273,7 @@ LABL 0 新宋体,8,N 可以获得的积分 int - + EA968274-2B27-4C3C-9565-619251E927BA growth growth @@ -14248,7 +14284,7 @@ LABL 0 新宋体,8,N 可以活动的成长值 int - + B8CC6F72-DB4E-4A81-9D94-16B7AE9470A1 promotion_info promotion_info @@ -14260,7 +14296,7 @@ LABL 0 新宋体,8,N varchar(100) 100 - + BBE7BE20-0F91-48B2-96EA-7852ACCE40D1 bill_type bill_type @@ -14272,7 +14308,7 @@ LABL 0 新宋体,8,N int(1) 1 - + 5A0811A5-51AF-47C2-A7F8-A2909F856961 bill_header bill_header @@ -14284,7 +14320,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + B0E18290-D990-4622-B718-71A7113E9480 bill_content bill_content @@ -14296,7 +14332,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + CE69C28B-C4BC-44AA-B3F2-30B6AD8390F8 bill_receiver_phone bill_receiver_phone @@ -14308,7 +14344,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + DB7AE7E6-2321-4C2C-8580-7AEB802EBE2C bill_receiver_email bill_receiver_email @@ -14320,7 +14356,7 @@ LABL 0 新宋体,8,N varchar(64) 64 - + 98B312FD-4E06-4D2B-AC6F-970B84E6C73F receiver_name receiver_name @@ -14332,7 +14368,7 @@ LABL 0 新宋体,8,N varchar(100) 100 - + 1174D5FE-B8AE-49E7-A4D2-F947BFE08091 receiver_phone receiver_phone @@ -14344,7 +14380,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + AA0D5272-63FA-45D9-8816-9D547B177F10 receiver_post_code receiver_post_code @@ -14356,7 +14392,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 7E47519A-F397-40EF-A70D-4B26E116BD67 receiver_province receiver_province @@ -14368,7 +14404,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 3218F635-7F7D-4A36-9BF2-E1C822053456 receiver_city receiver_city @@ -14380,7 +14416,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 8C3E74BC-0BCA-4E3F-A1F8-4C06D7192D4E receiver_region receiver_region @@ -14392,7 +14428,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 661DB749-D0D5-43E2-B96E-2444DA4DBA06 receiver_detail_address receiver_detail_address @@ -14404,7 +14440,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + F0169A36-508E-4CDA-8BD0-6077437C30DA note note @@ -14416,7 +14452,7 @@ LABL 0 新宋体,8,N varchar(500) 500 - + 735D23D8-B7B2-4474-A113-1ED7AAA6C9B8 confirm_status confirm_status @@ -14430,7 +14466,7 @@ LABL 0 新宋体,8,N - + F98BE405-9DED-4054-ABBF-40BD4672B58B Key_1 Key_1 @@ -14439,12 +14475,12 @@ LABL 0 新宋体,8,N 1522658346 zhenghong - + - + @@ -14458,7 +14494,7 @@ LABL 0 新宋体,8,N 订单中所包含的商品 - + C2ABF8A4-2DE7-4C17-8053-440A60BD8EE7 id id @@ -14470,7 +14506,7 @@ LABL 0 新宋体,8,N 1 1 - + B1934126-97B4-461B-B2A8-D53CCF81245C order_id order_id @@ -14481,7 +14517,7 @@ LABL 0 新宋体,8,N 订单id bigint - + EA411763-23EA-4E27-97CD-1C0D5925157C order_sn order_sn @@ -14493,7 +14529,7 @@ LABL 0 新宋体,8,N varchar(64) 64 - + DCF7D58B-AD64-48B0-9A65-4FDAE9A32DFB product_id product_id @@ -14503,7 +14539,7 @@ LABL 0 新宋体,8,N zhenghong bigint - + 7BDD65C2-224E-413D-AD83-437754569B1C proudct_pic proudct_pic @@ -14514,7 +14550,7 @@ LABL 0 新宋体,8,N varchar(500) 500 - + DFFC50EA-1E9A-4867-9EE8-B1A1B84E51E7 product_name product_name @@ -14525,7 +14561,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + 68478EE9-703A-4DFD-A085-7B109BBF650D product_brand product_brand @@ -14536,7 +14572,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + 27623FBE-2491-4310-AA4E-D93F4AD59154 product_sn product_sn @@ -14547,7 +14583,7 @@ LABL 0 新宋体,8,N varchar(64) 64 - + A9EF8281-439D-4D05-BB45-E933E648D979 product_amount product_amount @@ -14559,7 +14595,7 @@ LABL 0 新宋体,8,N 10 2 - + 015E8942-52BF-4342-9C4C-1230A266C1C9 product_count product_count @@ -14570,7 +14606,7 @@ LABL 0 新宋体,8,N 购买数量 int - + AD7CAE73-04BF-4BB8-BEFA-E0A7B94BF373 product_real_amount product_real_amount @@ -14583,7 +14619,7 @@ LABL 0 新宋体,8,N 10 2 - + 51302EF8-1CD4-43F5-9C02-7920ED857D35 sp1 sp1 @@ -14595,7 +14631,7 @@ LABL 0 新宋体,8,N varchar(100) 100 - + AA056090-3D72-4BAC-A931-CD49C31B9D7E sp2 sp2 @@ -14606,7 +14642,7 @@ LABL 0 新宋体,8,N varchar(100) 100 - + C0CCCE2C-B2C8-44A1-9F6B-771BFE62D760 sp3 sp3 @@ -14619,7 +14655,7 @@ LABL 0 新宋体,8,N - + 8B728C73-2ED3-4C44-8C64-95692A16EA10 Key_1 Key_1 @@ -14628,12 +14664,12 @@ LABL 0 新宋体,8,N 1522660745 zhenghong - + - + @@ -14647,7 +14683,7 @@ LABL 0 新宋体,8,N 订单操作历史记录 - + 46247D13-9B17-44EB-9300-7BA49AC214FB id id @@ -14659,7 +14695,7 @@ LABL 0 新宋体,8,N 1 1 - + CBAA2797-F782-492E-89D8-B87830B4FD86 order_id order_id @@ -14670,7 +14706,7 @@ LABL 0 新宋体,8,N 订单id bigint - + B26D3031-3438-4CAB-BC93-2277F41D2F64 operate_man operate_man @@ -14682,7 +14718,7 @@ LABL 0 新宋体,8,N varchar(100) 100 - + 14B87125-FC24-4D09-982E-F43F618B6C3A create_time create_time @@ -14693,7 +14729,7 @@ LABL 0 新宋体,8,N 操作时间 datetime - + 296A8CF6-1BC8-46E1-846F-25114FF35EEB order_status order_status @@ -14705,7 +14741,7 @@ LABL 0 新宋体,8,N int(1) 1 - + 9F651D4E-088F-4735-ACAD-12ED16C49FDE note note @@ -14719,7 +14755,7 @@ LABL 0 新宋体,8,N - + 50772925-29B2-4E77-A02B-5AB8C229953C Key_1 Key_1 @@ -14728,12 +14764,12 @@ LABL 0 新宋体,8,N 1522725011 zhenghong - + - + @@ -14747,7 +14783,7 @@ LABL 0 新宋体,8,N 订单设置表 - + 03B16432-ECCE-4698-B24A-05554E64C35C id id @@ -14759,7 +14795,7 @@ LABL 0 新宋体,8,N 1 1 - + AC98E6B7-ADDF-43AD-B2F0-6CFE7715E9F1 flash_order_overtime flash_order_overtime @@ -14770,7 +14806,7 @@ LABL 0 新宋体,8,N 秒杀订单超时关闭时间(分) int - + C4E474C5-194A-4B54-8DF1-F37B681DE42B normal_order_overtime normal_order_overtime @@ -14781,7 +14817,7 @@ LABL 0 新宋体,8,N 正常订单超时时间(分) int - + 773FEFCD-F4A3-4D9E-B061-10C12CA1B397 confirm_overtime confirm_overtime @@ -14792,7 +14828,7 @@ LABL 0 新宋体,8,N 发货后自动确认收货时间(天) int - + DD5B89B8-5DC6-4EB1-B916-D76BD75CB0F5 finish_overtime finish_overtime @@ -14803,7 +14839,7 @@ LABL 0 新宋体,8,N 自动完成交易时间,不能申请售后(天) int - + D090D0ED-6A45-445C-ADE3-F1E18734F159 comment_overtime comment_overtime @@ -14816,7 +14852,7 @@ LABL 0 新宋体,8,N - + 7C2ADDA9-1584-4310-A3FE-7F1E18447823 Key_1 Key_1 @@ -14825,12 +14861,12 @@ LABL 0 新宋体,8,N 1522726101 zhenghong - + - + @@ -14844,7 +14880,7 @@ LABL 0 新宋体,8,N 订单退货申请 - + CF99B61C-D0E5-4EB4-BFC6-111A9F3D44E8 id id @@ -14856,7 +14892,7 @@ LABL 0 新宋体,8,N 1 1 - + A6E68B83-006A-468C-A461-C647705E038C order_id order_id @@ -14867,7 +14903,7 @@ LABL 0 新宋体,8,N 订单id bigint - + 8D1F23F9-09FD-416B-8E38-CFDE67721417 company_address_id company_address_id @@ -14877,7 +14913,7 @@ LABL 0 新宋体,8,N zhenghong bigint - + 56ACAE3C-5533-44A1-BA57-602058B6CEF2 order_sn order_sn @@ -14889,7 +14925,7 @@ LABL 0 新宋体,8,N varchar(64) 64 - + F2C78E24-CDB0-4AA7-B6CD-21E55B380E95 create_time create_time @@ -14899,7 +14935,7 @@ LABL 0 新宋体,8,N zhenghong datetime - + 70FBE2CF-BE0D-44DD-8679-39DAA782E1A3 member_username member_username @@ -14910,7 +14946,7 @@ LABL 0 新宋体,8,N varchar(64) 64 - + 7B8A70B3-9FC9-4136-BEC9-D2DF393DB988 return_amount return_amount @@ -14923,7 +14959,7 @@ LABL 0 新宋体,8,N 10 2 - + 4FB9898E-63E4-4B21-B577-504320D3D4F9 return_name return_name @@ -14934,7 +14970,7 @@ LABL 0 新宋体,8,N varchar(100) 100 - + 8ADCC57B-6CA5-4A89-8B5A-6283FE7B3DDF return_phone return_phone @@ -14946,7 +14982,7 @@ LABL 0 新宋体,8,N varchar(100) 100 - + F01CC8D2-508C-424D-BF17-AE42ABE28223 status status @@ -14958,7 +14994,7 @@ LABL 0 新宋体,8,N int(1) 1 - + 65402A2F-A01C-4B4D-9F19-9ACD48637159 handle_time handle_time @@ -14969,7 +15005,7 @@ LABL 0 新宋体,8,N 处理时间 datetime - + AADBD0C8-E8CD-45D6-BDF4-13840EEFA26C product_pic product_pic @@ -14980,7 +15016,7 @@ LABL 0 新宋体,8,N varchar(500) 500 - + B4BB6015-3948-411C-9558-6CAF55CEF04C product_name product_name @@ -14991,7 +15027,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + D30E609F-3F5C-401C-8690-EEA47B0E6694 brand_name brand_name @@ -15002,7 +15038,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + 86B4B2F7-9A36-47AC-A3DA-7F45FFF21639 product_attr product_attr @@ -15014,7 +15050,7 @@ LABL 0 新宋体,8,N varchar(500) 500 - + DE661909-8CDC-4C09-A0C1-5587F969523A product_count product_count @@ -15025,7 +15061,7 @@ LABL 0 新宋体,8,N 退货数量 int - + B4DB3A15-7B0F-4C6D-B961-AF2C4CF14D50 reason reason @@ -15037,7 +15073,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + ECE8A578-4D6B-47EB-BB72-207D9BC93324 description description @@ -15049,7 +15085,7 @@ LABL 0 新宋体,8,N varchar(500) 500 - + E3C2C9CF-D72D-44AA-B1A3-5B5AC1950B63 proof_pics proof_pics @@ -15061,7 +15097,7 @@ LABL 0 新宋体,8,N varchar(1000) 1000 - + 4647C7DC-D2B4-48B7-B5F3-4524FBAAD875 return_post_amount return_post_amount @@ -15074,7 +15110,7 @@ LABL 0 新宋体,8,N 10 2 - + 8361AE87-5DC4-470B-B12E-4A2EF7708701 return_post_status return_post_status @@ -15086,7 +15122,7 @@ LABL 0 新宋体,8,N int(1) 1 - + 3870169D-4A55-444E-9574-19FB829E9CB8 confirm_return_amount confirm_return_amount @@ -15099,7 +15135,7 @@ LABL 0 新宋体,8,N 10 2 - + B16F27C1-DFFA-40F1-83B5-F9DA3BB86FE6 handle_note handle_note @@ -15111,7 +15147,7 @@ LABL 0 新宋体,8,N varchar(500) 500 - + B8982C29-EB0D-4F63-A047-DDEDC91A78C3 handle_man handle_man @@ -15123,7 +15159,7 @@ LABL 0 新宋体,8,N varchar(100) 100 - + 49E217E2-31BF-4F23-8125-62D5920E0B60 receive_man receive_man @@ -15135,7 +15171,7 @@ LABL 0 新宋体,8,N varchar(100) 100 - + 8111E4F5-B8EA-4DCB-B899-A2E4921E6BC2 receive_time receive_time @@ -15145,7 +15181,7 @@ LABL 0 新宋体,8,N zhenghong datetime - + 4C802C73-FB19-4C09-84C3-37E152CA8299 receive_note receive_note @@ -15158,7 +15194,7 @@ LABL 0 新宋体,8,N - + D06B934B-B63D-4DCC-B1C1-62F79744A8AC Key_1 Key_1 @@ -15167,12 +15203,12 @@ LABL 0 新宋体,8,N 1522732939 zhenghong - + - + @@ -15186,7 +15222,7 @@ LABL 0 新宋体,8,N 公司收发货地址表 - + F5A62BE4-F0B9-46C3-8591-5864BB83220D id id @@ -15198,7 +15234,7 @@ LABL 0 新宋体,8,N 1 1 - + 359C7F83-8810-4F75-935C-8099B75676C6 address_name address_name @@ -15210,7 +15246,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + 5AA8AC8B-9617-4A6F-B898-4206F7CE8169 send_status send_status @@ -15222,7 +15258,7 @@ LABL 0 新宋体,8,N int(1) 1 - + CDF1655B-32CC-4E54-BBE7-5F00549B7722 receive_status receive_status @@ -15234,7 +15270,7 @@ LABL 0 新宋体,8,N int(1) 1 - + F5195500-8663-482B-B587-27789546188C name name @@ -15246,7 +15282,7 @@ LABL 0 新宋体,8,N varchar(64) 64 - + D51012F2-BECB-4E6B-A7E9-5B6AC06D9087 phone phone @@ -15258,7 +15294,7 @@ LABL 0 新宋体,8,N varchar(64) 64 - + 3D2DC8D4-9D56-4E95-8266-052132761CDE province province @@ -15269,7 +15305,7 @@ LABL 0 新宋体,8,N varchar(64) 64 - + 57267BF2-434D-4AEC-8E6B-DDCAA85233F7 city city @@ -15280,7 +15316,7 @@ LABL 0 新宋体,8,N varchar(64) 64 - + F1F15023-139B-4048-8D0C-C9C46884C6E9 region region @@ -15293,7 +15329,7 @@ LABL 0 新宋体,8,N - + 9B8E57D5-D022-48D7-BA87-3214D2DAB1BD Key_1 Key_1 @@ -15302,12 +15338,12 @@ LABL 0 新宋体,8,N 1522745192 zhenghong - + - + @@ -15321,7 +15357,7 @@ LABL 0 新宋体,8,N 退货原因表 - + 8398CF1C-2327-4762-B370-7F7BB681FBE8 id id @@ -15333,7 +15369,7 @@ LABL 0 新宋体,8,N 1 1 - + 7C7CCC5E-FBE6-49A6-A428-95A8A078B4EA name name @@ -15345,7 +15381,7 @@ LABL 0 新宋体,8,N varchar(100) 100 - + 0C284FC4-E892-4BFF-B0AC-AD9BCB8E39D2 sort sort @@ -15355,7 +15391,7 @@ LABL 0 新宋体,8,N zhenghong int - + D0151FA2-84E3-4252-9565-766B748B7AD3 status status @@ -15369,7 +15405,7 @@ LABL 0 新宋体,8,N - + F0009D1F-CC14-45AA-BDB7-F25CFBBFE380 Key_1 Key_1 @@ -15378,12 +15414,12 @@ LABL 0 新宋体,8,N 1533115911 zhenghong - + - + @@ -15397,7 +15433,7 @@ LABL 0 新宋体,8,N 购物车表 - + 0496CCD8-F7CC-4DD4-AEE7-919D8EFCD676 id id @@ -15409,7 +15445,7 @@ LABL 0 新宋体,8,N 1 1 - + BC6AB2CA-354D-447A-A466-54980B87F57F product_id product_id @@ -15419,7 +15455,7 @@ LABL 0 新宋体,8,N zhenghong bigint - + 48241AB2-A6B4-48E5-A792-FAB72D97FD42 product_sku_id product_sku_id @@ -15429,7 +15465,7 @@ LABL 0 新宋体,8,N zhenghong bigint - + 70CEB9F6-7F7D-4AB1-BB9D-3667BA109C72 member_id member_id @@ -15439,7 +15475,7 @@ LABL 0 新宋体,8,N zhenghong bigint - + 8B8B68C0-7987-4E2B-9BAD-FF4F3428E03A quantity quantity @@ -15450,7 +15486,7 @@ LABL 0 新宋体,8,N 购买数量 int - + E2A71768-48C5-46B2-82B8-635169BFE66D price price @@ -15463,7 +15499,7 @@ LABL 0 新宋体,8,N 10 2 - + 1EB6341A-F163-4763-8A41-99BB5914189A sp1 sp1 @@ -15475,7 +15511,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + 10C79639-93BE-48F3-B2A4-98AC7C338882 sp2 sp2 @@ -15487,7 +15523,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + 629EE7D7-D006-4AB6-8EF9-0B30E4283004 sp3 sp3 @@ -15499,7 +15535,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + B5A53CF7-C87D-411B-89DF-41888E2722C7 product_pic product_pic @@ -15511,7 +15547,7 @@ LABL 0 新宋体,8,N varchar(1000) 1000 - + E1A4F06D-34AE-4B0C-BCC6-F82BA9D1A76F product_name product_name @@ -15523,7 +15559,7 @@ LABL 0 新宋体,8,N varchar(500) 500 - + 2D4BFCEF-83F1-4697-8EF7-DCC5D2A9491D product_sub_title product_sub_title @@ -15535,7 +15571,7 @@ LABL 0 新宋体,8,N varchar(500) 500 - + 8A7E5878-BB5E-49F3-BE20-E6986E172BB3 product_sku_code product_sku_code @@ -15547,7 +15583,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + 23C68713-D38A-4915-96E3-A9762199D386 member_nickname member_nickname @@ -15559,7 +15595,7 @@ LABL 0 新宋体,8,N varchar(500) 500 - + 5675315C-7265-4AC3-88D4-BC1525AC73B7 create_date create_date @@ -15570,7 +15606,7 @@ LABL 0 新宋体,8,N 创建时间 datetime - + 1D877A06-39CD-4A3C-B4A8-059588D13838 modify_date modify_date @@ -15581,7 +15617,7 @@ LABL 0 新宋体,8,N 修改时间 datetime - + 20EF4C13-435F-4C03-B8A9-7E31F1432E21 delete_status delete_status @@ -15596,7 +15632,7 @@ LABL 0 新宋体,8,N - + 29D735B7-E618-4C13-AF03-3858C68E6BA4 Key_1 Key_1 @@ -15605,12 +15641,12 @@ LABL 0 新宋体,8,N 1533108680 zhenghong - + - + @@ -15636,7 +15672,7 @@ LABL 0 新宋体,8,N - + 5236F74C-2761-4AC4-834A-BECC5D040393 1521706257 zhenghong @@ -15672,7 +15708,7 @@ LABL 0 新宋体,8,N - + 6EE78803-E5F6-4090-B810-7BBF7814F60C 1521710488 zhenghong @@ -15708,7 +15744,7 @@ LABL 0 新宋体,8,N - + 84F722B4-DF57-4BC3-88FD-B249B70D21A7 1521770349 zhenghong @@ -15744,7 +15780,7 @@ LABL 0 新宋体,8,N - + 0309D83E-51C3-4973-A636-9FEB27F4A6B6 1521771362 zhenghong @@ -15780,7 +15816,7 @@ LABL 0 新宋体,8,N - + 7B820697-9FFD-4446-B6DF-F03F4F02FFE3 1521773101 zhenghong @@ -15816,7 +15852,7 @@ LABL 0 新宋体,8,N - + 13DDC5F6-372D-47FF-AAFA-8AEF349E7FA8 1521783613 zhenghong @@ -15852,7 +15888,7 @@ LABL 0 新宋体,8,N - + 31ADEBC6-F176-41A7-8EAA-9AC3B8A253AB 1521791466 zhenghong @@ -15888,7 +15924,7 @@ LABL 0 新宋体,8,N - + F2B169B3-7AC8-4FB1-822D-E1C91DFF6FFD 1521792428 zhenghong @@ -15924,7 +15960,7 @@ LABL 0 新宋体,8,N - + 00AD7B43-F4CA-45D7-86BB-5756B4ED55BD 1521792909 zhenghong @@ -15960,7 +15996,7 @@ LABL 0 新宋体,8,N - + 286E06C6-6FAD-4323-82D9-6FB781153C46 1522045168 zhenghong @@ -15996,7 +16032,7 @@ LABL 0 新宋体,8,N - + A2161167-D453-4661-9BF0-71D8908A6C42 1522046100 zhenghong @@ -16032,7 +16068,7 @@ LABL 0 新宋体,8,N - + E25FF0B6-41E2-4801-8FE9-337EF9B991F7 1522046451 zhenghong @@ -16068,7 +16104,7 @@ LABL 0 新宋体,8,N - + 1E64FE44-48BA-49B0-BDE1-66DA22B89EFF 1522046456 zhenghong @@ -16104,7 +16140,7 @@ LABL 0 新宋体,8,N - + DEE74089-6A6D-4D7E-BADD-76E4D08EFA2D 1522112691 zhenghong @@ -16140,7 +16176,7 @@ LABL 0 新宋体,8,N - + 5D44A212-AD69-4958-BAAF-9E16ED63FC67 1522112694 zhenghong @@ -16176,7 +16212,7 @@ LABL 0 新宋体,8,N - + ECA8F78C-7015-44EB-9CD2-F72634D7F4BD 1522114406 zhenghong @@ -16212,7 +16248,7 @@ LABL 0 新宋体,8,N - + 32BD37D4-4436-4069-9BD1-90CF0B1867E0 1522115961 zhenghong @@ -16248,7 +16284,7 @@ LABL 0 新宋体,8,N - + 1A23B754-71EE-4496-B70F-0A3268C6F651 1522115983 zhenghong @@ -16284,7 +16320,7 @@ LABL 0 新宋体,8,N - + 1C883E67-84F9-4CD0-A4F5-D7CA2BE15DC5 1522118676 zhenghong @@ -16320,7 +16356,7 @@ LABL 0 新宋体,8,N - + 1CE2FCCB-DF37-4C88-99DD-FA8C3EE7A09C 1522119056 zhenghong @@ -16356,7 +16392,7 @@ LABL 0 新宋体,8,N - + 7D8DC4F2-D0A4-4CE9-B03E-44AE166786C0 1522120295 zhenghong @@ -16392,7 +16428,7 @@ LABL 0 新宋体,8,N - + 7CB99F50-753B-4347-B896-1F18D8FE6691 1522138613 zhenghong @@ -16428,7 +16464,7 @@ LABL 0 新宋体,8,N - + EC89DA87-A575-4940-973B-665854268261 1522138618 zhenghong @@ -16464,7 +16500,7 @@ LABL 0 新宋体,8,N - + 8E1A22EC-2246-48C4-A499-3D8A4D264C09 1522138705 zhenghong @@ -16500,7 +16536,7 @@ LABL 0 新宋体,8,N - + 2EA7348D-C8E8-4FCC-8215-01FE3AD58DFB 1522141157 zhenghong @@ -16536,7 +16572,7 @@ LABL 0 新宋体,8,N - + 8B858AAC-D00A-42FE-BEDC-73536876C045 1522141232 zhenghong @@ -16572,7 +16608,7 @@ LABL 0 新宋体,8,N - + FC3A22FE-FD24-4DF0-BAC8-22659D3C8987 1522141317 zhenghong @@ -16608,7 +16644,7 @@ LABL 0 新宋体,8,N - + 14DB9C0C-F9F0-4D4A-B44E-592028F6E75A 1522142006 zhenghong @@ -16644,7 +16680,7 @@ LABL 0 新宋体,8,N - + 15304E84-71AA-40B1-84CB-904384B34B25 1522215975 zhenghong @@ -16680,7 +16716,7 @@ LABL 0 新宋体,8,N - + 457237AD-87EB-4A09-BA9F-36198B10D2FF 1522216015 zhenghong @@ -16716,7 +16752,7 @@ LABL 0 新宋体,8,N - + 3C2E5F27-A07C-4D88-9357-089D36122A25 1522216251 zhenghong @@ -16752,7 +16788,7 @@ LABL 0 新宋体,8,N - + A8FA4798-0F1E-4D96-A254-77F5D71F6BBD 1522216380 zhenghong @@ -16788,7 +16824,7 @@ LABL 0 新宋体,8,N - + 5026171A-4B51-4B83-A113-4051F1E4F415 1522220508 zhenghong @@ -16824,7 +16860,7 @@ LABL 0 新宋体,8,N - + 462222B9-A203-4D60-A353-A168356E3140 1522220546 zhenghong @@ -16860,7 +16896,7 @@ LABL 0 新宋体,8,N - + BD28F911-4F98-4C9D-9171-E99F60476E2A 1522224364 zhenghong @@ -16896,7 +16932,7 @@ LABL 0 新宋体,8,N - + 8D1675C9-7749-4831-A5E6-ACD971AACF57 1522225874 zhenghong @@ -16932,7 +16968,7 @@ LABL 0 新宋体,8,N - + B30347B3-4138-4EA8-A0F5-EF0D9A34E01F 1522226077 zhenghong @@ -16968,7 +17004,7 @@ LABL 0 新宋体,8,N - + 7D29D8DF-7EF1-4F43-928F-DDAC96A23858 1522226272 zhenghong @@ -17004,7 +17040,7 @@ LABL 0 新宋体,8,N - + EB0A7FB4-285A-4D5D-BC1D-E9B299069C1F 1522301998 zhenghong @@ -17040,7 +17076,7 @@ LABL 0 新宋体,8,N - + 942BBD31-85B8-46EA-893C-CB327C86F5BA 1522303390 zhenghong @@ -17076,7 +17112,7 @@ LABL 0 新宋体,8,N - + 1E5174EE-C0B0-4144-98D5-679634DCCAEE 1522303410 zhenghong @@ -17112,7 +17148,7 @@ LABL 0 新宋体,8,N - + BD55704C-3F36-44CC-90E1-143F097FA894 1522304178 zhenghong @@ -17148,7 +17184,7 @@ LABL 0 新宋体,8,N - + 17EC5CAA-580C-493D-9C2D-2EA3E9732A78 1522386868 zhenghong @@ -17184,7 +17220,7 @@ LABL 0 新宋体,8,N - + F469B162-D88C-42A3-B64C-7B2751A4FCE1 1522387461 zhenghong @@ -17220,7 +17256,7 @@ LABL 0 新宋体,8,N - + 1D18BF30-4375-4618-A1C9-6DC998F248E4 1522387526 zhenghong @@ -17256,7 +17292,7 @@ LABL 0 新宋体,8,N - + 183F9969-663E-4842-ABC2-C938F02C05E4 1522389232 zhenghong @@ -17292,7 +17328,7 @@ LABL 0 新宋体,8,N - + AC355266-228D-4333-8E95-D13F2D176DB4 1522390434 zhenghong @@ -17328,7 +17364,7 @@ LABL 0 新宋体,8,N - + 3A358827-AE90-4AC6-80E6-CA340D69F7F2 1522390644 zhenghong @@ -17338,7 +17374,7 @@ LABL 0 新宋体,8,N - + @@ -17364,7 +17400,7 @@ LABL 0 新宋体,8,N - + B0F12E0B-F2E6-40A6-AD2B-9FE858AAA8BE 1522391366 zhenghong @@ -17374,7 +17410,7 @@ LABL 0 新宋体,8,N - + @@ -17397,20 +17433,20 @@ LABL 0 新宋体,8,N - + - + F46C48A9-78A1-4C9A-BD75-DE0ED230A76D 1522391379 zhenghong 1522391380 zhenghong - + - + @@ -17436,7 +17472,7 @@ LABL 0 新宋体,8,N - + 711AD4D5-212E-4E3B-BB26-DB79C4BE4E52 1522396648 zhenghong @@ -17446,7 +17482,7 @@ LABL 0 新宋体,8,N - + @@ -17472,7 +17508,7 @@ LABL 0 新宋体,8,N - + 094B7BE5-D0AB-4987-8D74-508A27D3117F 1522396864 zhenghong @@ -17482,7 +17518,7 @@ LABL 0 新宋体,8,N - + @@ -17508,7 +17544,7 @@ LABL 0 新宋体,8,N - + 8C15D427-62A0-40E7-9B02-84063CC6EB94 1522659209 zhenghong @@ -17518,7 +17554,7 @@ LABL 0 新宋体,8,N - + @@ -17541,20 +17577,20 @@ LABL 0 新宋体,8,N - + - + 043B7E7F-6688-42FD-BECE-3A4CE5A560F2 1522660753 zhenghong 1522660753 zhenghong - + - + @@ -17580,7 +17616,7 @@ LABL 0 新宋体,8,N - + 3592DAA0-2C95-48CF-9359-C157A0E27DC3 1522660820 zhenghong @@ -17590,7 +17626,7 @@ LABL 0 新宋体,8,N - + @@ -17616,7 +17652,7 @@ LABL 0 新宋体,8,N - + BEE8D279-8DBF-40B3-899D-5B07570D0AD9 1522721755 zhenghong @@ -17652,7 +17688,7 @@ LABL 0 新宋体,8,N - + F5D0566A-35C3-4451-9C7D-782BC776C53E 1522724329 zhenghong @@ -17662,7 +17698,7 @@ LABL 0 新宋体,8,N - + @@ -17685,20 +17721,20 @@ LABL 0 新宋体,8,N - + - + 3AA8813B-9363-406A-91DF-4AD16E9C3CCA 1522725331 zhenghong 1522725331 zhenghong - + - + @@ -17721,20 +17757,20 @@ LABL 0 新宋体,8,N - + - + DD05624A-7E08-4273-9758-C5EDA1A03134 1522733188 zhenghong 1522733188 zhenghong - + - + @@ -17757,20 +17793,20 @@ LABL 0 新宋体,8,N - + - + EBF8A4B9-24B3-4D18-82FD-D12F847328C6 1522745521 zhenghong 1522745521 zhenghong - + - + @@ -17796,7 +17832,7 @@ LABL 0 新宋体,8,N - + BA7665F0-D173-45C6-AFE8-3C93CF330D79 1533109970 zhenghong @@ -17806,7 +17842,7 @@ LABL 0 新宋体,8,N - + @@ -17832,7 +17868,7 @@ LABL 0 新宋体,8,N - + 521484A5-B9C4-477D-8D45-97F7B15D7854 1533115829 zhenghong @@ -17842,7 +17878,7 @@ LABL 0 新宋体,8,N - + @@ -17868,7 +17904,7 @@ LABL 0 新宋体,8,N - + FCADB7B3-0636-44C7-8AB4-067148971867 1533115896 zhenghong @@ -17878,14 +17914,14 @@ LABL 0 新宋体,8,N - + - + 48492A0F-63AD-4453-B46B-89915CC87545 PUBLIC PUBLIC @@ -17896,7 +17932,7 @@ LABL 0 新宋体,8,N - + 232AA7B8-E743-48F3-9530-102684B229BE MySQL 5.0 MYSQL50 diff --git a/mall-mbg/src/main/java/com/macro/mall/model/UmsMemberReceiveAddress.java b/mall-mbg/src/main/java/com/macro/mall/model/UmsMemberReceiveAddress.java index 91c00e1..73c548d 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/UmsMemberReceiveAddress.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/UmsMemberReceiveAddress.java @@ -17,11 +17,11 @@ public class UmsMemberReceiveAddress implements Serializable { private String phoneNumber; /** - * 收货地址 + * 是否为默认 * * @mbggenerated */ - private String address; + private Integer defaultStatus; /** * 邮政编码 @@ -31,11 +31,32 @@ public class UmsMemberReceiveAddress implements Serializable { private String postCode; /** - * 是否为默认 + * 省份/直辖市 * * @mbggenerated */ - private Integer defaultStatus; + private String province; + + /** + * 城市 + * + * @mbggenerated + */ + private String city; + + /** + * 区 + * + * @mbggenerated + */ + private String region; + + /** + * 详细地址(街道) + * + * @mbggenerated + */ + private String detailAddress; private static final long serialVersionUID = 1L; @@ -71,12 +92,12 @@ public class UmsMemberReceiveAddress implements Serializable { this.phoneNumber = phoneNumber; } - public String getAddress() { - return address; + public Integer getDefaultStatus() { + return defaultStatus; } - public void setAddress(String address) { - this.address = address; + public void setDefaultStatus(Integer defaultStatus) { + this.defaultStatus = defaultStatus; } public String getPostCode() { @@ -87,12 +108,36 @@ public class UmsMemberReceiveAddress implements Serializable { this.postCode = postCode; } - public Integer getDefaultStatus() { - return defaultStatus; + public String getProvince() { + return province; } - public void setDefaultStatus(Integer defaultStatus) { - this.defaultStatus = defaultStatus; + public void setProvince(String province) { + this.province = province; + } + + public String getCity() { + return city; + } + + public void setCity(String city) { + this.city = city; + } + + public String getRegion() { + return region; + } + + public void setRegion(String region) { + this.region = region; + } + + public String getDetailAddress() { + return detailAddress; + } + + public void setDetailAddress(String detailAddress) { + this.detailAddress = detailAddress; } @Override @@ -105,9 +150,12 @@ public class UmsMemberReceiveAddress implements Serializable { sb.append(", memberId=").append(memberId); sb.append(", name=").append(name); sb.append(", phoneNumber=").append(phoneNumber); - sb.append(", address=").append(address); - sb.append(", postCode=").append(postCode); sb.append(", defaultStatus=").append(defaultStatus); + sb.append(", postCode=").append(postCode); + sb.append(", province=").append(province); + sb.append(", city=").append(city); + sb.append(", region=").append(region); + sb.append(", detailAddress=").append(detailAddress); sb.append(", serialVersionUID=").append(serialVersionUID); sb.append("]"); return sb.toString(); diff --git a/mall-mbg/src/main/java/com/macro/mall/model/UmsMemberReceiveAddressExample.java b/mall-mbg/src/main/java/com/macro/mall/model/UmsMemberReceiveAddressExample.java index bd5a101..f0ea3e7 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/UmsMemberReceiveAddressExample.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/UmsMemberReceiveAddressExample.java @@ -364,73 +364,63 @@ public class UmsMemberReceiveAddressExample { return (Criteria) this; } - public Criteria andAddressIsNull() { - addCriterion("address is null"); + public Criteria andDefaultStatusIsNull() { + addCriterion("default_status is null"); return (Criteria) this; } - public Criteria andAddressIsNotNull() { - addCriterion("address is not null"); + public Criteria andDefaultStatusIsNotNull() { + addCriterion("default_status is not null"); return (Criteria) this; } - public Criteria andAddressEqualTo(String value) { - addCriterion("address =", value, "address"); + public Criteria andDefaultStatusEqualTo(Integer value) { + addCriterion("default_status =", value, "defaultStatus"); return (Criteria) this; } - public Criteria andAddressNotEqualTo(String value) { - addCriterion("address <>", value, "address"); + public Criteria andDefaultStatusNotEqualTo(Integer value) { + addCriterion("default_status <>", value, "defaultStatus"); return (Criteria) this; } - public Criteria andAddressGreaterThan(String value) { - addCriterion("address >", value, "address"); + public Criteria andDefaultStatusGreaterThan(Integer value) { + addCriterion("default_status >", value, "defaultStatus"); return (Criteria) this; } - public Criteria andAddressGreaterThanOrEqualTo(String value) { - addCriterion("address >=", value, "address"); + public Criteria andDefaultStatusGreaterThanOrEqualTo(Integer value) { + addCriterion("default_status >=", value, "defaultStatus"); return (Criteria) this; } - public Criteria andAddressLessThan(String value) { - addCriterion("address <", value, "address"); + public Criteria andDefaultStatusLessThan(Integer value) { + addCriterion("default_status <", value, "defaultStatus"); return (Criteria) this; } - public Criteria andAddressLessThanOrEqualTo(String value) { - addCriterion("address <=", value, "address"); + public Criteria andDefaultStatusLessThanOrEqualTo(Integer value) { + addCriterion("default_status <=", value, "defaultStatus"); return (Criteria) this; } - public Criteria andAddressLike(String value) { - addCriterion("address like", value, "address"); + public Criteria andDefaultStatusIn(List values) { + addCriterion("default_status in", values, "defaultStatus"); return (Criteria) this; } - public Criteria andAddressNotLike(String value) { - addCriterion("address not like", value, "address"); + public Criteria andDefaultStatusNotIn(List values) { + addCriterion("default_status not in", values, "defaultStatus"); return (Criteria) this; } - public Criteria andAddressIn(List values) { - addCriterion("address in", values, "address"); + public Criteria andDefaultStatusBetween(Integer value1, Integer value2) { + addCriterion("default_status between", value1, value2, "defaultStatus"); return (Criteria) this; } - public Criteria andAddressNotIn(List values) { - addCriterion("address not in", values, "address"); - return (Criteria) this; - } - - public Criteria andAddressBetween(String value1, String value2) { - addCriterion("address between", value1, value2, "address"); - return (Criteria) this; - } - - public Criteria andAddressNotBetween(String value1, String value2) { - addCriterion("address not between", value1, value2, "address"); + public Criteria andDefaultStatusNotBetween(Integer value1, Integer value2) { + addCriterion("default_status not between", value1, value2, "defaultStatus"); return (Criteria) this; } @@ -504,63 +494,283 @@ public class UmsMemberReceiveAddressExample { return (Criteria) this; } - public Criteria andDefaultStatusIsNull() { - addCriterion("default_status is null"); + public Criteria andProvinceIsNull() { + addCriterion("province is null"); return (Criteria) this; } - public Criteria andDefaultStatusIsNotNull() { - addCriterion("default_status is not null"); + public Criteria andProvinceIsNotNull() { + addCriterion("province is not null"); return (Criteria) this; } - public Criteria andDefaultStatusEqualTo(Integer value) { - addCriterion("default_status =", value, "defaultStatus"); + public Criteria andProvinceEqualTo(String value) { + addCriterion("province =", value, "province"); return (Criteria) this; } - public Criteria andDefaultStatusNotEqualTo(Integer value) { - addCriterion("default_status <>", value, "defaultStatus"); + public Criteria andProvinceNotEqualTo(String value) { + addCriterion("province <>", value, "province"); return (Criteria) this; } - public Criteria andDefaultStatusGreaterThan(Integer value) { - addCriterion("default_status >", value, "defaultStatus"); + public Criteria andProvinceGreaterThan(String value) { + addCriterion("province >", value, "province"); return (Criteria) this; } - public Criteria andDefaultStatusGreaterThanOrEqualTo(Integer value) { - addCriterion("default_status >=", value, "defaultStatus"); + public Criteria andProvinceGreaterThanOrEqualTo(String value) { + addCriterion("province >=", value, "province"); return (Criteria) this; } - public Criteria andDefaultStatusLessThan(Integer value) { - addCriterion("default_status <", value, "defaultStatus"); + public Criteria andProvinceLessThan(String value) { + addCriterion("province <", value, "province"); return (Criteria) this; } - public Criteria andDefaultStatusLessThanOrEqualTo(Integer value) { - addCriterion("default_status <=", value, "defaultStatus"); + public Criteria andProvinceLessThanOrEqualTo(String value) { + addCriterion("province <=", value, "province"); return (Criteria) this; } - public Criteria andDefaultStatusIn(List values) { - addCriterion("default_status in", values, "defaultStatus"); + public Criteria andProvinceLike(String value) { + addCriterion("province like", value, "province"); return (Criteria) this; } - public Criteria andDefaultStatusNotIn(List values) { - addCriterion("default_status not in", values, "defaultStatus"); + public Criteria andProvinceNotLike(String value) { + addCriterion("province not like", value, "province"); return (Criteria) this; } - public Criteria andDefaultStatusBetween(Integer value1, Integer value2) { - addCriterion("default_status between", value1, value2, "defaultStatus"); + public Criteria andProvinceIn(List values) { + addCriterion("province in", values, "province"); return (Criteria) this; } - public Criteria andDefaultStatusNotBetween(Integer value1, Integer value2) { - addCriterion("default_status not between", value1, value2, "defaultStatus"); + public Criteria andProvinceNotIn(List values) { + addCriterion("province not in", values, "province"); + return (Criteria) this; + } + + public Criteria andProvinceBetween(String value1, String value2) { + addCriterion("province between", value1, value2, "province"); + return (Criteria) this; + } + + public Criteria andProvinceNotBetween(String value1, String value2) { + addCriterion("province not between", value1, value2, "province"); + return (Criteria) this; + } + + public Criteria andCityIsNull() { + addCriterion("city is null"); + return (Criteria) this; + } + + public Criteria andCityIsNotNull() { + addCriterion("city is not null"); + return (Criteria) this; + } + + public Criteria andCityEqualTo(String value) { + addCriterion("city =", value, "city"); + return (Criteria) this; + } + + public Criteria andCityNotEqualTo(String value) { + addCriterion("city <>", value, "city"); + return (Criteria) this; + } + + public Criteria andCityGreaterThan(String value) { + addCriterion("city >", value, "city"); + return (Criteria) this; + } + + public Criteria andCityGreaterThanOrEqualTo(String value) { + addCriterion("city >=", value, "city"); + return (Criteria) this; + } + + public Criteria andCityLessThan(String value) { + addCriterion("city <", value, "city"); + return (Criteria) this; + } + + public Criteria andCityLessThanOrEqualTo(String value) { + addCriterion("city <=", value, "city"); + return (Criteria) this; + } + + public Criteria andCityLike(String value) { + addCriterion("city like", value, "city"); + return (Criteria) this; + } + + public Criteria andCityNotLike(String value) { + addCriterion("city not like", value, "city"); + return (Criteria) this; + } + + public Criteria andCityIn(List values) { + addCriterion("city in", values, "city"); + return (Criteria) this; + } + + public Criteria andCityNotIn(List values) { + addCriterion("city not in", values, "city"); + return (Criteria) this; + } + + public Criteria andCityBetween(String value1, String value2) { + addCriterion("city between", value1, value2, "city"); + return (Criteria) this; + } + + public Criteria andCityNotBetween(String value1, String value2) { + addCriterion("city not between", value1, value2, "city"); + return (Criteria) this; + } + + public Criteria andRegionIsNull() { + addCriterion("region is null"); + return (Criteria) this; + } + + public Criteria andRegionIsNotNull() { + addCriterion("region is not null"); + return (Criteria) this; + } + + public Criteria andRegionEqualTo(String value) { + addCriterion("region =", value, "region"); + return (Criteria) this; + } + + public Criteria andRegionNotEqualTo(String value) { + addCriterion("region <>", value, "region"); + return (Criteria) this; + } + + public Criteria andRegionGreaterThan(String value) { + addCriterion("region >", value, "region"); + return (Criteria) this; + } + + public Criteria andRegionGreaterThanOrEqualTo(String value) { + addCriterion("region >=", value, "region"); + return (Criteria) this; + } + + public Criteria andRegionLessThan(String value) { + addCriterion("region <", value, "region"); + return (Criteria) this; + } + + public Criteria andRegionLessThanOrEqualTo(String value) { + addCriterion("region <=", value, "region"); + return (Criteria) this; + } + + public Criteria andRegionLike(String value) { + addCriterion("region like", value, "region"); + return (Criteria) this; + } + + public Criteria andRegionNotLike(String value) { + addCriterion("region not like", value, "region"); + return (Criteria) this; + } + + public Criteria andRegionIn(List values) { + addCriterion("region in", values, "region"); + return (Criteria) this; + } + + public Criteria andRegionNotIn(List values) { + addCriterion("region not in", values, "region"); + return (Criteria) this; + } + + public Criteria andRegionBetween(String value1, String value2) { + addCriterion("region between", value1, value2, "region"); + return (Criteria) this; + } + + public Criteria andRegionNotBetween(String value1, String value2) { + addCriterion("region not between", value1, value2, "region"); + return (Criteria) this; + } + + public Criteria andDetailAddressIsNull() { + addCriterion("detail_address is null"); + return (Criteria) this; + } + + public Criteria andDetailAddressIsNotNull() { + addCriterion("detail_address is not null"); + return (Criteria) this; + } + + public Criteria andDetailAddressEqualTo(String value) { + addCriterion("detail_address =", value, "detailAddress"); + return (Criteria) this; + } + + public Criteria andDetailAddressNotEqualTo(String value) { + addCriterion("detail_address <>", value, "detailAddress"); + return (Criteria) this; + } + + public Criteria andDetailAddressGreaterThan(String value) { + addCriterion("detail_address >", value, "detailAddress"); + return (Criteria) this; + } + + public Criteria andDetailAddressGreaterThanOrEqualTo(String value) { + addCriterion("detail_address >=", value, "detailAddress"); + return (Criteria) this; + } + + public Criteria andDetailAddressLessThan(String value) { + addCriterion("detail_address <", value, "detailAddress"); + return (Criteria) this; + } + + public Criteria andDetailAddressLessThanOrEqualTo(String value) { + addCriterion("detail_address <=", value, "detailAddress"); + return (Criteria) this; + } + + public Criteria andDetailAddressLike(String value) { + addCriterion("detail_address like", value, "detailAddress"); + return (Criteria) this; + } + + public Criteria andDetailAddressNotLike(String value) { + addCriterion("detail_address not like", value, "detailAddress"); + return (Criteria) this; + } + + public Criteria andDetailAddressIn(List values) { + addCriterion("detail_address in", values, "detailAddress"); + return (Criteria) this; + } + + public Criteria andDetailAddressNotIn(List values) { + addCriterion("detail_address not in", values, "detailAddress"); + return (Criteria) this; + } + + public Criteria andDetailAddressBetween(String value1, String value2) { + addCriterion("detail_address between", value1, value2, "detailAddress"); + return (Criteria) this; + } + + public Criteria andDetailAddressNotBetween(String value1, String value2) { + addCriterion("detail_address not between", value1, value2, "detailAddress"); return (Criteria) this; } } diff --git a/mall-mbg/src/main/resources/com/macro/mall/mapper/UmsMemberReceiveAddressMapper.xml b/mall-mbg/src/main/resources/com/macro/mall/mapper/UmsMemberReceiveAddressMapper.xml index c09bd63..f1ce384 100644 --- a/mall-mbg/src/main/resources/com/macro/mall/mapper/UmsMemberReceiveAddressMapper.xml +++ b/mall-mbg/src/main/resources/com/macro/mall/mapper/UmsMemberReceiveAddressMapper.xml @@ -6,9 +6,12 @@ - - + + + + + @@ -69,7 +72,8 @@ - id, member_id, name, phone_number, address, post_code, default_status + id, member_id, name, phone_number, default_status, post_code, province, city, region, + detail_address