From b33f396d530c3b8579be3d7e9041cbb5c541618e Mon Sep 17 00:00:00 2001 From: zhh Date: Thu, 30 Aug 2018 16:22:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=94=9F=E6=88=90=E7=A1=AE?= =?UTF-8?q?=E8=AE=A4=E5=8D=95=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- document/pdm/mall.pdb | 481 +++++++++-------- document/pdm/mall.pdm | 486 ++++++++++-------- .../UmsIntegrationConsumeSettingMapper.java | 30 ++ .../UmsIntergrationConsumeSettingMapper.java | 30 -- .../java/com/macro/mall/model/OmsOrder.java | 32 ++ .../com/macro/mall/model/OmsOrderExample.java | 120 +++++ ...java => UmsIntegrationConsumeSetting.java} | 2 +- ... UmsIntegrationConsumeSettingExample.java} | 4 +- .../com/macro/mall/mapper/OmsOrderMapper.xml | 86 +++- ...=> UmsIntegrationConsumeSettingMapper.xml} | 40 +- .../controller/OmsPortalOrderController.java | 31 ++ .../portal/domain/ConfirmOrderResult.java | 117 +++++ .../portal/service/OmsPortalOrderService.java | 14 + .../impl/OmsPortalOrderServiceImpl.java | 75 +++ .../service/impl/OmsPromotionServiceImpl.java | 3 +- 15 files changed, 1026 insertions(+), 525 deletions(-) create mode 100644 mall-mbg/src/main/java/com/macro/mall/mapper/UmsIntegrationConsumeSettingMapper.java delete mode 100644 mall-mbg/src/main/java/com/macro/mall/mapper/UmsIntergrationConsumeSettingMapper.java rename mall-mbg/src/main/java/com/macro/mall/model/{UmsIntergrationConsumeSetting.java => UmsIntegrationConsumeSetting.java} (96%) rename mall-mbg/src/main/java/com/macro/mall/model/{UmsIntergrationConsumeSettingExample.java => UmsIntegrationConsumeSettingExample.java} (99%) rename mall-mbg/src/main/resources/com/macro/mall/mapper/{UmsIntergrationConsumeSettingMapper.xml => UmsIntegrationConsumeSettingMapper.xml} (88%) create mode 100644 mall-portal/src/main/java/com/macro/mall/portal/controller/OmsPortalOrderController.java create mode 100644 mall-portal/src/main/java/com/macro/mall/portal/domain/ConfirmOrderResult.java create mode 100644 mall-portal/src/main/java/com/macro/mall/portal/service/OmsPortalOrderService.java create mode 100644 mall-portal/src/main/java/com/macro/mall/portal/service/impl/OmsPortalOrderServiceImpl.java diff --git a/document/pdm/mall.pdb b/document/pdm/mall.pdb index a47672a..7b4e006 100644 --- a/document/pdm/mall.pdb +++ b/document/pdm/mall.pdb @@ -1,5 +1,5 @@ - + @@ -14040,7 +14040,7 @@ LABL 0 新宋体,8,N oms_order 1522658325 zhenghong -1522725970 +1535612363 zhenghong 订单表 @@ -14064,9 +14064,10 @@ LABL 0 新宋体,8,N member_id 1522659209 zhenghong -1522659220 +1535612363 zhenghong bigint +1 7A1BB5A1-6ACE-4259-9D2F-A11D74465729 @@ -14127,6 +14128,19 @@ LABL 0 新宋体,8,N 2 +AA07B22F-DFD0-4443-B124-4E7A948B8F1A +pay_amount +pay_amount +1535611784 +zhenghong +1535611836 +zhenghong +应付金额（实际支付金额） +decimal(10,2) +10 +2 + + 93484605-04CB-4451-BA1C-1D43843E1FE8 freight_amount freight_amount @@ -14139,7 +14153,7 @@ LABL 0 新宋体,8,N 10 2 - + 31D4C71F-D7FF-4C00-88F3-D1A8B195D948 promotion_amount promotion_amount @@ -14152,7 +14166,7 @@ LABL 0 新宋体,8,N 10 2 - + 2AC97908-B95C-4C45-AD78-5AEBD42D415E integration_amount integration_amount @@ -14165,7 +14179,7 @@ LABL 0 新宋体,8,N 10 2 - + BDECF3D8-B85D-459A-9336-D298B11A129C coupon_amount coupon_amount @@ -14178,7 +14192,7 @@ LABL 0 新宋体,8,N 10 2 - + 570A30CB-E74E-4D54-A2F5-354511EEAD73 discount_amount discount_amount @@ -14191,7 +14205,7 @@ LABL 0 新宋体,8,N 10 2 - + 2506F5AD-C896-45DA-B1A9-47A3F09F32A7 pay_type pay_type @@ -14203,7 +14217,7 @@ LABL 0 新宋体,8,N int(1) 1 - + 1E796BD6-898E-4EDA-8ADE-A86D6305ED56 source_type source_type @@ -14215,7 +14229,7 @@ LABL 0 新宋体,8,N int(1) 1 - + EBDE3354-1D7D-43AF-ADC1-D73233AF9967 status status @@ -14227,7 +14241,7 @@ LABL 0 新宋体,8,N int(1) 1 - + 17C117FA-5488-480A-98AD-35E18E6B084D order_type order_type @@ -14239,7 +14253,7 @@ LABL 0 新宋体,8,N int(1) 1 - + 61822C95-27AC-4143-8C5F-CDE6DFE15B2C delivery_company delivery_company @@ -14251,7 +14265,7 @@ LABL 0 新宋体,8,N varchar(64) 64 - + 91DA7F9F-8F28-4D16-8A89-1379C5141304 delivery_sn delivery_sn @@ -14263,7 +14277,7 @@ LABL 0 新宋体,8,N varchar(64) 64 - + ACB792D2-4ED5-47EE-BAFD-C389DAAA07E3 auto_confirm_day auto_confirm_day @@ -14274,7 +14288,7 @@ LABL 0 新宋体,8,N 自动确认时间（天） int - + C142CF56-1ED7-4D71-95DF-9F114248A7BC integration integration @@ -14285,7 +14299,7 @@ LABL 0 新宋体,8,N 可以获得的积分 int - + EA968274-2B27-4C3C-9565-619251E927BA growth growth @@ -14296,7 +14310,7 @@ LABL 0 新宋体,8,N 可以活动的成长值 int - + B8CC6F72-DB4E-4A81-9D94-16B7AE9470A1 promotion_info promotion_info @@ -14308,7 +14322,7 @@ LABL 0 新宋体,8,N varchar(100) 100 - + BBE7BE20-0F91-48B2-96EA-7852ACCE40D1 bill_type bill_type @@ -14320,7 +14334,7 @@ LABL 0 新宋体,8,N int(1) 1 - + 5A0811A5-51AF-47C2-A7F8-A2909F856961 bill_header bill_header @@ -14332,7 +14346,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + B0E18290-D990-4622-B718-71A7113E9480 bill_content bill_content @@ -14344,7 +14358,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + CE69C28B-C4BC-44AA-B3F2-30B6AD8390F8 bill_receiver_phone bill_receiver_phone @@ -14356,7 +14370,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + DB7AE7E6-2321-4C2C-8580-7AEB802EBE2C bill_receiver_email bill_receiver_email @@ -14368,31 +14382,33 @@ LABL 0 新宋体,8,N varchar(64) 64 - + 98B312FD-4E06-4D2B-AC6F-970B84E6C73F receiver_name receiver_name 1522660318 zhenghong -1522660403 +1535612363 zhenghong 收货人姓名 varchar(100) 100 +1 - + 1174D5FE-B8AE-49E7-A4D2-F947BFE08091 receiver_phone receiver_phone 1522660394 zhenghong -1522660424 +1535612363 zhenghong 收货人电话 varchar(32) 32 +1 - + AA0D5272-63FA-45D9-8816-9D547B177F10 receiver_post_code receiver_post_code @@ -14404,7 +14420,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 7E47519A-F397-40EF-A70D-4B26E116BD67 receiver_province receiver_province @@ -14416,7 +14432,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 3218F635-7F7D-4A36-9BF2-E1C822053456 receiver_city receiver_city @@ -14428,7 +14444,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 8C3E74BC-0BCA-4E3F-A1F8-4C06D7192D4E receiver_region receiver_region @@ -14440,7 +14456,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 661DB749-D0D5-43E2-B96E-2444DA4DBA06 receiver_detail_address receiver_detail_address @@ -14452,7 +14468,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + F0169A36-508E-4CDA-8BD0-6077437C30DA note note @@ -14464,7 +14480,7 @@ LABL 0 新宋体,8,N varchar(500) 500 - + 735D23D8-B7B2-4474-A113-1ED7AAA6C9B8 confirm_status confirm_status @@ -14476,9 +14492,27 @@ LABL 0 新宋体,8,N int(1) 1 + +1D7E85F6-2738-40D2-A69D-1B55994F607A +delete_status +delete_status +1535611815 +zhenghong +1535612418 +zhenghong +删除状态：0->未删除；1->已删除 +0 +int(1) +1 +1 +{F4F16ECD-F2F1-4006-AF6F-638D5C65F35E},MYSQL50,102={9480E6AA-83DD-4AA7-9C91-E48F709C29D9},CharSet,0= +{B314652C-DD43-4F81-8524-6F97A1BAACBA},Collate,0= + + + - + F98BE405-9DED-4054-ABBF-40BD4672B58B Key_1 Key_1 @@ -14492,7 +14526,7 @@ LABL 0 新宋体,8,N - + @@ -14506,7 +14540,7 @@ LABL 0 新宋体,8,N 订单中所包含的商品 - + C2ABF8A4-2DE7-4C17-8053-440A60BD8EE7 id id @@ -14518,7 +14552,7 @@ LABL 0 新宋体,8,N 1 1 - + B1934126-97B4-461B-B2A8-D53CCF81245C order_id order_id @@ -14529,7 +14563,7 @@ LABL 0 新宋体,8,N 订单id bigint - + EA411763-23EA-4E27-97CD-1C0D5925157C order_sn order_sn @@ -14541,7 +14575,7 @@ LABL 0 新宋体,8,N varchar(64) 64 - + DCF7D58B-AD64-48B0-9A65-4FDAE9A32DFB product_id product_id @@ -14551,7 +14585,7 @@ LABL 0 新宋体,8,N zhenghong bigint - + 7BDD65C2-224E-413D-AD83-437754569B1C proudct_pic proudct_pic @@ -14562,7 +14596,7 @@ LABL 0 新宋体,8,N varchar(500) 500 - + DFFC50EA-1E9A-4867-9EE8-B1A1B84E51E7 product_name product_name @@ -14573,7 +14607,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + 68478EE9-703A-4DFD-A085-7B109BBF650D product_brand product_brand @@ -14584,7 +14618,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + 27623FBE-2491-4310-AA4E-D93F4AD59154 product_sn product_sn @@ -14595,7 +14629,7 @@ LABL 0 新宋体,8,N varchar(64) 64 - + A9EF8281-439D-4D05-BB45-E933E648D979 product_amount product_amount @@ -14607,7 +14641,7 @@ LABL 0 新宋体,8,N 10 2 - + 015E8942-52BF-4342-9C4C-1230A266C1C9 product_count product_count @@ -14618,7 +14652,7 @@ LABL 0 新宋体,8,N 购买数量 int - + AD7CAE73-04BF-4BB8-BEFA-E0A7B94BF373 product_real_amount product_real_amount @@ -14631,7 +14665,7 @@ LABL 0 新宋体,8,N 10 2 - + 51302EF8-1CD4-43F5-9C02-7920ED857D35 sp1 sp1 @@ -14643,7 +14677,7 @@ LABL 0 新宋体,8,N varchar(100) 100 - + AA056090-3D72-4BAC-A931-CD49C31B9D7E sp2 sp2 @@ -14654,7 +14688,7 @@ LABL 0 新宋体,8,N varchar(100) 100 - + C0CCCE2C-B2C8-44A1-9F6B-771BFE62D760 sp3 sp3 @@ -14667,7 +14701,7 @@ LABL 0 新宋体,8,N - + 8B728C73-2ED3-4C44-8C64-95692A16EA10 Key_1 Key_1 @@ -14676,12 +14710,12 @@ LABL 0 新宋体,8,N 1522660745 zhenghong - + - + @@ -14695,7 +14729,7 @@ LABL 0 新宋体,8,N 订单操作历史记录 - + 46247D13-9B17-44EB-9300-7BA49AC214FB id id @@ -14707,7 +14741,7 @@ LABL 0 新宋体,8,N 1 1 - + CBAA2797-F782-492E-89D8-B87830B4FD86 order_id order_id @@ -14718,7 +14752,7 @@ LABL 0 新宋体,8,N 订单id bigint - + B26D3031-3438-4CAB-BC93-2277F41D2F64 operate_man operate_man @@ -14730,7 +14764,7 @@ LABL 0 新宋体,8,N varchar(100) 100 - + 14B87125-FC24-4D09-982E-F43F618B6C3A create_time create_time @@ -14741,7 +14775,7 @@ LABL 0 新宋体,8,N 操作时间 datetime - + 296A8CF6-1BC8-46E1-846F-25114FF35EEB order_status order_status @@ -14753,7 +14787,7 @@ LABL 0 新宋体,8,N int(1) 1 - + 9F651D4E-088F-4735-ACAD-12ED16C49FDE note note @@ -14767,7 +14801,7 @@ LABL 0 新宋体,8,N - + 50772925-29B2-4E77-A02B-5AB8C229953C Key_1 Key_1 @@ -14776,12 +14810,12 @@ LABL 0 新宋体,8,N 1522725011 zhenghong - + - + @@ -14795,7 +14829,7 @@ LABL 0 新宋体,8,N 订单设置表 - + 03B16432-ECCE-4698-B24A-05554E64C35C id id @@ -14807,7 +14841,7 @@ LABL 0 新宋体,8,N 1 1 - + AC98E6B7-ADDF-43AD-B2F0-6CFE7715E9F1 flash_order_overtime flash_order_overtime @@ -14818,7 +14852,7 @@ LABL 0 新宋体,8,N 秒杀订单超时关闭时间(分) int - + C4E474C5-194A-4B54-8DF1-F37B681DE42B normal_order_overtime normal_order_overtime @@ -14829,7 +14863,7 @@ LABL 0 新宋体,8,N 正常订单超时时间(分) int - + 773FEFCD-F4A3-4D9E-B061-10C12CA1B397 confirm_overtime confirm_overtime @@ -14840,7 +14874,7 @@ LABL 0 新宋体,8,N 发货后自动确认收货时间（天） int - + DD5B89B8-5DC6-4EB1-B916-D76BD75CB0F5 finish_overtime finish_overtime @@ -14851,7 +14885,7 @@ LABL 0 新宋体,8,N 自动完成交易时间，不能申请售后（天） int - + D090D0ED-6A45-445C-ADE3-F1E18734F159 comment_overtime comment_overtime @@ -14864,7 +14898,7 @@ LABL 0 新宋体,8,N - + 7C2ADDA9-1584-4310-A3FE-7F1E18447823 Key_1 Key_1 @@ -14873,12 +14907,12 @@ LABL 0 新宋体,8,N 1522726101 zhenghong - + - + @@ -14892,7 +14926,7 @@ LABL 0 新宋体,8,N 订单退货申请 - + CF99B61C-D0E5-4EB4-BFC6-111A9F3D44E8 id id @@ -14904,7 +14938,7 @@ LABL 0 新宋体,8,N 1 1 - + A6E68B83-006A-468C-A461-C647705E038C order_id order_id @@ -14915,7 +14949,7 @@ LABL 0 新宋体,8,N 订单id bigint - + 8D1F23F9-09FD-416B-8E38-CFDE67721417 company_address_id company_address_id @@ -14925,7 +14959,7 @@ LABL 0 新宋体,8,N zhenghong bigint - + 56ACAE3C-5533-44A1-BA57-602058B6CEF2 order_sn order_sn @@ -14937,7 +14971,7 @@ LABL 0 新宋体,8,N varchar(64) 64 - + F2C78E24-CDB0-4AA7-B6CD-21E55B380E95 create_time create_time @@ -14947,7 +14981,7 @@ LABL 0 新宋体,8,N zhenghong datetime - + 70FBE2CF-BE0D-44DD-8679-39DAA782E1A3 member_username member_username @@ -14958,7 +14992,7 @@ LABL 0 新宋体,8,N varchar(64) 64 - + 7B8A70B3-9FC9-4136-BEC9-D2DF393DB988 return_amount return_amount @@ -14971,7 +15005,7 @@ LABL 0 新宋体,8,N 10 2 - + 4FB9898E-63E4-4B21-B577-504320D3D4F9 return_name return_name @@ -14982,7 +15016,7 @@ LABL 0 新宋体,8,N varchar(100) 100 - + 8ADCC57B-6CA5-4A89-8B5A-6283FE7B3DDF return_phone return_phone @@ -14994,7 +15028,7 @@ LABL 0 新宋体,8,N varchar(100) 100 - + F01CC8D2-508C-424D-BF17-AE42ABE28223 status status @@ -15006,7 +15040,7 @@ LABL 0 新宋体,8,N int(1) 1 - + 65402A2F-A01C-4B4D-9F19-9ACD48637159 handle_time handle_time @@ -15017,7 +15051,7 @@ LABL 0 新宋体,8,N 处理时间 datetime - + AADBD0C8-E8CD-45D6-BDF4-13840EEFA26C product_pic product_pic @@ -15028,7 +15062,7 @@ LABL 0 新宋体,8,N varchar(500) 500 - + B4BB6015-3948-411C-9558-6CAF55CEF04C product_name product_name @@ -15039,7 +15073,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + D30E609F-3F5C-401C-8690-EEA47B0E6694 brand_name brand_name @@ -15050,7 +15084,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + 86B4B2F7-9A36-47AC-A3DA-7F45FFF21639 product_attr product_attr @@ -15062,7 +15096,7 @@ LABL 0 新宋体,8,N varchar(500) 500 - + DE661909-8CDC-4C09-A0C1-5587F969523A product_count product_count @@ -15073,7 +15107,7 @@ LABL 0 新宋体,8,N 退货数量 int - + B4DB3A15-7B0F-4C6D-B961-AF2C4CF14D50 reason reason @@ -15085,7 +15119,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + ECE8A578-4D6B-47EB-BB72-207D9BC93324 description description @@ -15097,7 +15131,7 @@ LABL 0 新宋体,8,N varchar(500) 500 - + E3C2C9CF-D72D-44AA-B1A3-5B5AC1950B63 proof_pics proof_pics @@ -15109,7 +15143,7 @@ LABL 0 新宋体,8,N varchar(1000) 1000 - + 4647C7DC-D2B4-48B7-B5F3-4524FBAAD875 return_post_amount return_post_amount @@ -15122,7 +15156,7 @@ LABL 0 新宋体,8,N 10 2 - + 8361AE87-5DC4-470B-B12E-4A2EF7708701 return_post_status return_post_status @@ -15134,7 +15168,7 @@ LABL 0 新宋体,8,N int(1) 1 - + 3870169D-4A55-444E-9574-19FB829E9CB8 confirm_return_amount confirm_return_amount @@ -15147,7 +15181,7 @@ LABL 0 新宋体,8,N 10 2 - + B16F27C1-DFFA-40F1-83B5-F9DA3BB86FE6 handle_note handle_note @@ -15159,7 +15193,7 @@ LABL 0 新宋体,8,N varchar(500) 500 - + B8982C29-EB0D-4F63-A047-DDEDC91A78C3 handle_man handle_man @@ -15171,7 +15205,7 @@ LABL 0 新宋体,8,N varchar(100) 100 - + 49E217E2-31BF-4F23-8125-62D5920E0B60 receive_man receive_man @@ -15183,7 +15217,7 @@ LABL 0 新宋体,8,N varchar(100) 100 - + 8111E4F5-B8EA-4DCB-B899-A2E4921E6BC2 receive_time receive_time @@ -15193,7 +15227,7 @@ LABL 0 新宋体,8,N zhenghong datetime - + 4C802C73-FB19-4C09-84C3-37E152CA8299 receive_note receive_note @@ -15206,7 +15240,7 @@ LABL 0 新宋体,8,N - + D06B934B-B63D-4DCC-B1C1-62F79744A8AC Key_1 Key_1 @@ -15215,12 +15249,12 @@ LABL 0 新宋体,8,N 1522732939 zhenghong - + - + @@ -15234,7 +15268,7 @@ LABL 0 新宋体,8,N 公司收发货地址表 - + F5A62BE4-F0B9-46C3-8591-5864BB83220D id id @@ -15246,7 +15280,7 @@ LABL 0 新宋体,8,N 1 1 - + 359C7F83-8810-4F75-935C-8099B75676C6 address_name address_name @@ -15258,7 +15292,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + 5AA8AC8B-9617-4A6F-B898-4206F7CE8169 send_status send_status @@ -15270,7 +15304,7 @@ LABL 0 新宋体,8,N int(1) 1 - + CDF1655B-32CC-4E54-BBE7-5F00549B7722 receive_status receive_status @@ -15282,7 +15316,7 @@ LABL 0 新宋体,8,N int(1) 1 - + F5195500-8663-482B-B587-27789546188C name name @@ -15294,7 +15328,7 @@ LABL 0 新宋体,8,N varchar(64) 64 - + D51012F2-BECB-4E6B-A7E9-5B6AC06D9087 phone phone @@ -15306,7 +15340,7 @@ LABL 0 新宋体,8,N varchar(64) 64 - + 3D2DC8D4-9D56-4E95-8266-052132761CDE province province @@ -15317,7 +15351,7 @@ LABL 0 新宋体,8,N varchar(64) 64 - + 57267BF2-434D-4AEC-8E6B-DDCAA85233F7 city city @@ -15328,7 +15362,7 @@ LABL 0 新宋体,8,N varchar(64) 64 - + F1F15023-139B-4048-8D0C-C9C46884C6E9 region region @@ -15341,7 +15375,7 @@ LABL 0 新宋体,8,N - + 9B8E57D5-D022-48D7-BA87-3214D2DAB1BD Key_1 Key_1 @@ -15350,12 +15384,12 @@ LABL 0 新宋体,8,N 1522745192 zhenghong - + - + @@ -15369,7 +15403,7 @@ LABL 0 新宋体,8,N 退货原因表 - + 8398CF1C-2327-4762-B370-7F7BB681FBE8 id id @@ -15381,7 +15415,7 @@ LABL 0 新宋体,8,N 1 1 - + 7C7CCC5E-FBE6-49A6-A428-95A8A078B4EA name name @@ -15393,7 +15427,7 @@ LABL 0 新宋体,8,N varchar(100) 100 - + 0C284FC4-E892-4BFF-B0AC-AD9BCB8E39D2 sort sort @@ -15403,7 +15437,7 @@ LABL 0 新宋体,8,N zhenghong int - + D0151FA2-84E3-4252-9565-766B748B7AD3 status status @@ -15417,7 +15451,7 @@ LABL 0 新宋体,8,N - + F0009D1F-CC14-45AA-BDB7-F25CFBBFE380 Key_1 Key_1 @@ -15426,12 +15460,12 @@ LABL 0 新宋体,8,N 1533115911 zhenghong - + - + @@ -15440,12 +15474,12 @@ LABL 0 新宋体,8,N oms_cart_item 1533108597 zhenghong -1533172443 +1535530955 zhenghong 购物车表 - + 0496CCD8-F7CC-4DD4-AEE7-919D8EFCD676 id id @@ -15457,7 +15491,7 @@ LABL 0 新宋体,8,N 1 1 - + BC6AB2CA-354D-447A-A466-54980B87F57F product_id product_id @@ -15467,7 +15501,7 @@ LABL 0 新宋体,8,N zhenghong bigint - + 48241AB2-A6B4-48E5-A792-FAB72D97FD42 product_sku_id product_sku_id @@ -15477,7 +15511,7 @@ LABL 0 新宋体,8,N zhenghong bigint - + 70CEB9F6-7F7D-4AB1-BB9D-3667BA109C72 member_id member_id @@ -15487,7 +15521,7 @@ LABL 0 新宋体,8,N zhenghong bigint - + 8B8B68C0-7987-4E2B-9BAD-FF4F3428E03A quantity quantity @@ -15498,7 +15532,7 @@ LABL 0 新宋体,8,N 购买数量 int - + E2A71768-48C5-46B2-82B8-635169BFE66D price price @@ -15511,7 +15545,7 @@ LABL 0 新宋体,8,N 10 2 - + 1EB6341A-F163-4763-8A41-99BB5914189A sp1 sp1 @@ -15523,7 +15557,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + 10C79639-93BE-48F3-B2A4-98AC7C338882 sp2 sp2 @@ -15535,7 +15569,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + 629EE7D7-D006-4AB6-8EF9-0B30E4283004 sp3 sp3 @@ -15547,7 +15581,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + B5A53CF7-C87D-411B-89DF-41888E2722C7 product_pic product_pic @@ -15559,7 +15593,7 @@ LABL 0 新宋体,8,N varchar(1000) 1000 - + E1A4F06D-34AE-4B0C-BCC6-F82BA9D1A76F product_name product_name @@ -15571,7 +15605,7 @@ LABL 0 新宋体,8,N varchar(500) 500 - + 2D4BFCEF-83F1-4697-8EF7-DCC5D2A9491D product_sub_title product_sub_title @@ -15583,7 +15617,7 @@ LABL 0 新宋体,8,N varchar(500) 500 - + 8A7E5878-BB5E-49F3-BE20-E6986E172BB3 product_sku_code product_sku_code @@ -15595,7 +15629,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + 23C68713-D38A-4915-96E3-A9762199D386 member_nickname member_nickname @@ -15607,7 +15641,7 @@ LABL 0 新宋体,8,N varchar(500) 500 - + 5675315C-7265-4AC3-88D4-BC1525AC73B7 create_date create_date @@ -15618,7 +15652,7 @@ LABL 0 新宋体,8,N 创建时间 datetime - + 1D877A06-39CD-4A3C-B4A8-059588D13838 modify_date modify_date @@ -15629,7 +15663,7 @@ LABL 0 新宋体,8,N 修改时间 datetime - + 20EF4C13-435F-4C03-B8A9-7E31F1432E21 delete_status delete_status @@ -15642,9 +15676,20 @@ LABL 0 新宋体,8,N int(1) 1 + +9C9C2AC9-F58B-4D31-BEF4-1D1892931E51 +product_category_id +product_category_id +1535530934 +zhenghong +1535530961 +zhenghong +商品的分类 +bigint + - + 29D735B7-E618-4C13-AF03-3858C68E6BA4 Key_1 Key_1 @@ -15653,12 +15698,12 @@ LABL 0 新宋体,8,N 1533108680 zhenghong - + - + @@ -15684,7 +15729,7 @@ LABL 0 新宋体,8,N - + 5236F74C-2761-4AC4-834A-BECC5D040393 1521706257 zhenghong @@ -15720,7 +15765,7 @@ LABL 0 新宋体,8,N - + 6EE78803-E5F6-4090-B810-7BBF7814F60C 1521710488 zhenghong @@ -15756,7 +15801,7 @@ LABL 0 新宋体,8,N - + 84F722B4-DF57-4BC3-88FD-B249B70D21A7 1521770349 zhenghong @@ -15792,7 +15837,7 @@ LABL 0 新宋体,8,N - + 0309D83E-51C3-4973-A636-9FEB27F4A6B6 1521771362 zhenghong @@ -15828,7 +15873,7 @@ LABL 0 新宋体,8,N - + 7B820697-9FFD-4446-B6DF-F03F4F02FFE3 1521773101 zhenghong @@ -15864,7 +15909,7 @@ LABL 0 新宋体,8,N - + 13DDC5F6-372D-47FF-AAFA-8AEF349E7FA8 1521783613 zhenghong @@ -15900,7 +15945,7 @@ LABL 0 新宋体,8,N - + 31ADEBC6-F176-41A7-8EAA-9AC3B8A253AB 1521791466 zhenghong @@ -15936,7 +15981,7 @@ LABL 0 新宋体,8,N - + F2B169B3-7AC8-4FB1-822D-E1C91DFF6FFD 1521792428 zhenghong @@ -15972,7 +16017,7 @@ LABL 0 新宋体,8,N - + 00AD7B43-F4CA-45D7-86BB-5756B4ED55BD 1521792909 zhenghong @@ -16008,7 +16053,7 @@ LABL 0 新宋体,8,N - + 286E06C6-6FAD-4323-82D9-6FB781153C46 1522045168 zhenghong @@ -16044,7 +16089,7 @@ LABL 0 新宋体,8,N - + A2161167-D453-4661-9BF0-71D8908A6C42 1522046100 zhenghong @@ -16080,7 +16125,7 @@ LABL 0 新宋体,8,N - + E25FF0B6-41E2-4801-8FE9-337EF9B991F7 1522046451 zhenghong @@ -16116,7 +16161,7 @@ LABL 0 新宋体,8,N - + 1E64FE44-48BA-49B0-BDE1-66DA22B89EFF 1522046456 zhenghong @@ -16152,7 +16197,7 @@ LABL 0 新宋体,8,N - + DEE74089-6A6D-4D7E-BADD-76E4D08EFA2D 1522112691 zhenghong @@ -16188,7 +16233,7 @@ LABL 0 新宋体,8,N - + 5D44A212-AD69-4958-BAAF-9E16ED63FC67 1522112694 zhenghong @@ -16224,7 +16269,7 @@ LABL 0 新宋体,8,N - + ECA8F78C-7015-44EB-9CD2-F72634D7F4BD 1522114406 zhenghong @@ -16260,7 +16305,7 @@ LABL 0 新宋体,8,N - + 32BD37D4-4436-4069-9BD1-90CF0B1867E0 1522115961 zhenghong @@ -16296,7 +16341,7 @@ LABL 0 新宋体,8,N - + 1A23B754-71EE-4496-B70F-0A3268C6F651 1522115983 zhenghong @@ -16332,7 +16377,7 @@ LABL 0 新宋体,8,N - + 1C883E67-84F9-4CD0-A4F5-D7CA2BE15DC5 1522118676 zhenghong @@ -16368,7 +16413,7 @@ LABL 0 新宋体,8,N - + 1CE2FCCB-DF37-4C88-99DD-FA8C3EE7A09C 1522119056 zhenghong @@ -16404,7 +16449,7 @@ LABL 0 新宋体,8,N - + 7D8DC4F2-D0A4-4CE9-B03E-44AE166786C0 1522120295 zhenghong @@ -16440,7 +16485,7 @@ LABL 0 新宋体,8,N - + 7CB99F50-753B-4347-B896-1F18D8FE6691 1522138613 zhenghong @@ -16476,7 +16521,7 @@ LABL 0 新宋体,8,N - + EC89DA87-A575-4940-973B-665854268261 1522138618 zhenghong @@ -16512,7 +16557,7 @@ LABL 0 新宋体,8,N - + 8E1A22EC-2246-48C4-A499-3D8A4D264C09 1522138705 zhenghong @@ -16548,7 +16593,7 @@ LABL 0 新宋体,8,N - + 2EA7348D-C8E8-4FCC-8215-01FE3AD58DFB 1522141157 zhenghong @@ -16584,7 +16629,7 @@ LABL 0 新宋体,8,N - + 8B858AAC-D00A-42FE-BEDC-73536876C045 1522141232 zhenghong @@ -16620,7 +16665,7 @@ LABL 0 新宋体,8,N - + FC3A22FE-FD24-4DF0-BAC8-22659D3C8987 1522141317 zhenghong @@ -16656,7 +16701,7 @@ LABL 0 新宋体,8,N - + 14DB9C0C-F9F0-4D4A-B44E-592028F6E75A 1522142006 zhenghong @@ -16692,7 +16737,7 @@ LABL 0 新宋体,8,N - + 15304E84-71AA-40B1-84CB-904384B34B25 1522215975 zhenghong @@ -16728,7 +16773,7 @@ LABL 0 新宋体,8,N - + 457237AD-87EB-4A09-BA9F-36198B10D2FF 1522216015 zhenghong @@ -16764,7 +16809,7 @@ LABL 0 新宋体,8,N - + 3C2E5F27-A07C-4D88-9357-089D36122A25 1522216251 zhenghong @@ -16800,7 +16845,7 @@ LABL 0 新宋体,8,N - + A8FA4798-0F1E-4D96-A254-77F5D71F6BBD 1522216380 zhenghong @@ -16836,7 +16881,7 @@ LABL 0 新宋体,8,N - + 5026171A-4B51-4B83-A113-4051F1E4F415 1522220508 zhenghong @@ -16872,7 +16917,7 @@ LABL 0 新宋体,8,N - + 462222B9-A203-4D60-A353-A168356E3140 1522220546 zhenghong @@ -16908,7 +16953,7 @@ LABL 0 新宋体,8,N - + BD28F911-4F98-4C9D-9171-E99F60476E2A 1522224364 zhenghong @@ -16944,7 +16989,7 @@ LABL 0 新宋体,8,N - + 8D1675C9-7749-4831-A5E6-ACD971AACF57 1522225874 zhenghong @@ -16980,7 +17025,7 @@ LABL 0 新宋体,8,N - + B30347B3-4138-4EA8-A0F5-EF0D9A34E01F 1522226077 zhenghong @@ -17016,7 +17061,7 @@ LABL 0 新宋体,8,N - + 7D29D8DF-7EF1-4F43-928F-DDAC96A23858 1522226272 zhenghong @@ -17052,7 +17097,7 @@ LABL 0 新宋体,8,N - + EB0A7FB4-285A-4D5D-BC1D-E9B299069C1F 1522301998 zhenghong @@ -17088,7 +17133,7 @@ LABL 0 新宋体,8,N - + 942BBD31-85B8-46EA-893C-CB327C86F5BA 1522303390 zhenghong @@ -17124,7 +17169,7 @@ LABL 0 新宋体,8,N - + 1E5174EE-C0B0-4144-98D5-679634DCCAEE 1522303410 zhenghong @@ -17160,7 +17205,7 @@ LABL 0 新宋体,8,N - + BD55704C-3F36-44CC-90E1-143F097FA894 1522304178 zhenghong @@ -17196,7 +17241,7 @@ LABL 0 新宋体,8,N - + 17EC5CAA-580C-493D-9C2D-2EA3E9732A78 1522386868 zhenghong @@ -17232,7 +17277,7 @@ LABL 0 新宋体,8,N - + F469B162-D88C-42A3-B64C-7B2751A4FCE1 1522387461 zhenghong @@ -17268,7 +17313,7 @@ LABL 0 新宋体,8,N - + 1D18BF30-4375-4618-A1C9-6DC998F248E4 1522387526 zhenghong @@ -17304,7 +17349,7 @@ LABL 0 新宋体,8,N - + 183F9969-663E-4842-ABC2-C938F02C05E4 1522389232 zhenghong @@ -17340,7 +17385,7 @@ LABL 0 新宋体,8,N - + AC355266-228D-4333-8E95-D13F2D176DB4 1522390434 zhenghong @@ -17376,7 +17421,7 @@ LABL 0 新宋体,8,N - + 3A358827-AE90-4AC6-80E6-CA340D69F7F2 1522390644 zhenghong @@ -17412,7 +17457,7 @@ LABL 0 新宋体,8,N - + B0F12E0B-F2E6-40A6-AD2B-9FE858AAA8BE 1522391366 zhenghong @@ -17448,7 +17493,7 @@ LABL 0 新宋体,8,N - + F46C48A9-78A1-4C9A-BD75-DE0ED230A76D 1522391379 zhenghong @@ -17484,7 +17529,7 @@ LABL 0 新宋体,8,N - + 711AD4D5-212E-4E3B-BB26-DB79C4BE4E52 1522396648 zhenghong @@ -17520,7 +17565,7 @@ LABL 0 新宋体,8,N - + 094B7BE5-D0AB-4987-8D74-508A27D3117F 1522396864 zhenghong @@ -17556,7 +17601,7 @@ LABL 0 新宋体,8,N - + 8C15D427-62A0-40E7-9B02-84063CC6EB94 1522659209 zhenghong @@ -17589,10 +17634,10 @@ LABL 0 新宋体,8,N - + - + 043B7E7F-6688-42FD-BECE-3A4CE5A560F2 1522660753 zhenghong @@ -17602,7 +17647,7 @@ LABL 0 新宋体,8,N - + @@ -17628,7 +17673,7 @@ LABL 0 新宋体,8,N - + 3592DAA0-2C95-48CF-9359-C157A0E27DC3 1522660820 zhenghong @@ -17638,7 +17683,7 @@ LABL 0 新宋体,8,N - + @@ -17664,7 +17709,7 @@ LABL 0 新宋体,8,N - + BEE8D279-8DBF-40B3-899D-5B07570D0AD9 1522721755 zhenghong @@ -17700,7 +17745,7 @@ LABL 0 新宋体,8,N - + F5D0566A-35C3-4451-9C7D-782BC776C53E 1522724329 zhenghong @@ -17733,10 +17778,10 @@ LABL 0 新宋体,8,N - + - + 3AA8813B-9363-406A-91DF-4AD16E9C3CCA 1522725331 zhenghong @@ -17746,7 +17791,7 @@ LABL 0 新宋体,8,N - + @@ -17769,10 +17814,10 @@ LABL 0 新宋体,8,N - + - + DD05624A-7E08-4273-9758-C5EDA1A03134 1522733188 zhenghong @@ -17782,7 +17827,7 @@ LABL 0 新宋体,8,N - + @@ -17805,20 +17850,20 @@ LABL 0 新宋体,8,N - + - + EBF8A4B9-24B3-4D18-82FD-D12F847328C6 1522745521 zhenghong 1522745521 zhenghong - + - + @@ -17844,7 +17889,7 @@ LABL 0 新宋体,8,N - + BA7665F0-D173-45C6-AFE8-3C93CF330D79 1533109970 zhenghong @@ -17854,7 +17899,7 @@ LABL 0 新宋体,8,N - + @@ -17880,7 +17925,7 @@ LABL 0 新宋体,8,N - + 521484A5-B9C4-477D-8D45-97F7B15D7854 1533115829 zhenghong @@ -17890,7 +17935,7 @@ LABL 0 新宋体,8,N - + @@ -17916,7 +17961,7 @@ LABL 0 新宋体,8,N - + FCADB7B3-0636-44C7-8AB4-067148971867 1533115896 zhenghong @@ -17926,14 +17971,14 @@ LABL 0 新宋体,8,N - + - + 48492A0F-63AD-4453-B46B-89915CC87545 PUBLIC PUBLIC @@ -17944,7 +17989,7 @@ LABL 0 新宋体,8,N - + 232AA7B8-E743-48F3-9530-102684B229BE MySQL 5.0 MYSQL50 diff --git a/document/pdm/mall.pdm b/document/pdm/mall.pdm index 52e8e9d..9bafc65 100644 --- a/document/pdm/mall.pdm +++ b/document/pdm/mall.pdm @@ -1,5 +1,5 @@ - + @@ -4937,8 +4937,8 @@ DESTINATION 0 新宋体,8,N 1522226272 1522399075 -((-31175,47728), (83441,113756)) -((83041,113356),(83041,50658),(-30550,50658),(-30550,48128)) +((-38306,47728), (83441,113756)) +((83041,113356),(83041,94555),(-37681,94555),(-37681,48128)) 1 1 12615680 @@ -5113,8 +5113,8 @@ DESTINATION 0 新宋体,8,N 1522389232 1522398872 -((28232,58216), (43845,60017)) -((28632,59617),(28632,58841),(43445,58841)) +((33605,58216), (43845,60017)) +((34005,59617),(34005,58841),(43445,58841)) 1 1 12615680 @@ -6918,7 +6918,7 @@ LABL 0 新宋体,8,N 1522398032 -1522398627 +1535615091 -1 ((22716,17129), (36336,22677)) 12615680 @@ -13949,11 +13949,11 @@ LABL 0 新宋体,8,N C1DCA2EA-AC28-420C-BFEF-FFE7F5644910 -ums_intergration_consume_setting -ums_intergration_consume_setting +ums_integration_consume_setting +ums_integration_consume_setting 1522398032 zhenghong -1522398305 +1535615091 zhenghong 积分消费设置 @@ -14040,7 +14040,7 @@ LABL 0 新宋体,8,N oms_order 1522658325 zhenghong -1522725970 +1535612363 zhenghong 订单表 @@ -14064,9 +14064,10 @@ LABL 0 新宋体,8,N member_id 1522659209 zhenghong -1522659220 +1535612363 zhenghong bigint +1 7A1BB5A1-6ACE-4259-9D2F-A11D74465729 @@ -14127,6 +14128,19 @@ LABL 0 新宋体,8,N 2 +AA07B22F-DFD0-4443-B124-4E7A948B8F1A +pay_amount +pay_amount +1535611784 +zhenghong +1535611836 +zhenghong +应付金额（实际支付金额） +decimal(10,2) +10 +2 + + 93484605-04CB-4451-BA1C-1D43843E1FE8 freight_amount freight_amount @@ -14139,7 +14153,7 @@ LABL 0 新宋体,8,N 10 2 - + 31D4C71F-D7FF-4C00-88F3-D1A8B195D948 promotion_amount promotion_amount @@ -14152,7 +14166,7 @@ LABL 0 新宋体,8,N 10 2 - + 2AC97908-B95C-4C45-AD78-5AEBD42D415E integration_amount integration_amount @@ -14165,7 +14179,7 @@ LABL 0 新宋体,8,N 10 2 - + BDECF3D8-B85D-459A-9336-D298B11A129C coupon_amount coupon_amount @@ -14178,7 +14192,7 @@ LABL 0 新宋体,8,N 10 2 - + 570A30CB-E74E-4D54-A2F5-354511EEAD73 discount_amount discount_amount @@ -14191,7 +14205,7 @@ LABL 0 新宋体,8,N 10 2 - + 2506F5AD-C896-45DA-B1A9-47A3F09F32A7 pay_type pay_type @@ -14203,7 +14217,7 @@ LABL 0 新宋体,8,N int(1) 1 - + 1E796BD6-898E-4EDA-8ADE-A86D6305ED56 source_type source_type @@ -14215,7 +14229,7 @@ LABL 0 新宋体,8,N int(1) 1 - + EBDE3354-1D7D-43AF-ADC1-D73233AF9967 status status @@ -14227,7 +14241,7 @@ LABL 0 新宋体,8,N int(1) 1 - + 17C117FA-5488-480A-98AD-35E18E6B084D order_type order_type @@ -14239,7 +14253,7 @@ LABL 0 新宋体,8,N int(1) 1 - + 61822C95-27AC-4143-8C5F-CDE6DFE15B2C delivery_company delivery_company @@ -14251,7 +14265,7 @@ LABL 0 新宋体,8,N varchar(64) 64 - + 91DA7F9F-8F28-4D16-8A89-1379C5141304 delivery_sn delivery_sn @@ -14263,7 +14277,7 @@ LABL 0 新宋体,8,N varchar(64) 64 - + ACB792D2-4ED5-47EE-BAFD-C389DAAA07E3 auto_confirm_day auto_confirm_day @@ -14274,7 +14288,7 @@ LABL 0 新宋体,8,N 自动确认时间（天） int - + C142CF56-1ED7-4D71-95DF-9F114248A7BC integration integration @@ -14285,7 +14299,7 @@ LABL 0 新宋体,8,N 可以获得的积分 int - + EA968274-2B27-4C3C-9565-619251E927BA growth growth @@ -14296,7 +14310,7 @@ LABL 0 新宋体,8,N 可以活动的成长值 int - + B8CC6F72-DB4E-4A81-9D94-16B7AE9470A1 promotion_info promotion_info @@ -14308,7 +14322,7 @@ LABL 0 新宋体,8,N varchar(100) 100 - + BBE7BE20-0F91-48B2-96EA-7852ACCE40D1 bill_type bill_type @@ -14320,7 +14334,7 @@ LABL 0 新宋体,8,N int(1) 1 - + 5A0811A5-51AF-47C2-A7F8-A2909F856961 bill_header bill_header @@ -14332,7 +14346,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + B0E18290-D990-4622-B718-71A7113E9480 bill_content bill_content @@ -14344,7 +14358,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + CE69C28B-C4BC-44AA-B3F2-30B6AD8390F8 bill_receiver_phone bill_receiver_phone @@ -14356,7 +14370,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + DB7AE7E6-2321-4C2C-8580-7AEB802EBE2C bill_receiver_email bill_receiver_email @@ -14368,31 +14382,33 @@ LABL 0 新宋体,8,N varchar(64) 64 - + 98B312FD-4E06-4D2B-AC6F-970B84E6C73F receiver_name receiver_name 1522660318 zhenghong -1522660403 +1535612363 zhenghong 收货人姓名 varchar(100) 100 +1 - + 1174D5FE-B8AE-49E7-A4D2-F947BFE08091 receiver_phone receiver_phone 1522660394 zhenghong -1522660424 +1535612363 zhenghong 收货人电话 varchar(32) 32 +1 - + AA0D5272-63FA-45D9-8816-9D547B177F10 receiver_post_code receiver_post_code @@ -14404,7 +14420,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 7E47519A-F397-40EF-A70D-4B26E116BD67 receiver_province receiver_province @@ -14416,7 +14432,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 3218F635-7F7D-4A36-9BF2-E1C822053456 receiver_city receiver_city @@ -14428,7 +14444,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 8C3E74BC-0BCA-4E3F-A1F8-4C06D7192D4E receiver_region receiver_region @@ -14440,7 +14456,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 661DB749-D0D5-43E2-B96E-2444DA4DBA06 receiver_detail_address receiver_detail_address @@ -14452,7 +14468,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + F0169A36-508E-4CDA-8BD0-6077437C30DA note note @@ -14464,7 +14480,7 @@ LABL 0 新宋体,8,N varchar(500) 500 - + 735D23D8-B7B2-4474-A113-1ED7AAA6C9B8 confirm_status confirm_status @@ -14476,9 +14492,27 @@ LABL 0 新宋体,8,N int(1) 1 + +1D7E85F6-2738-40D2-A69D-1B55994F607A +delete_status +delete_status +1535611815 +zhenghong +1535612418 +zhenghong +删除状态：0->未删除；1->已删除 +0 +int(1) +1 +1 +{F4F16ECD-F2F1-4006-AF6F-638D5C65F35E},MYSQL50,102={9480E6AA-83DD-4AA7-9C91-E48F709C29D9},CharSet,0= +{B314652C-DD43-4F81-8524-6F97A1BAACBA},Collate,0= + + + - + F98BE405-9DED-4054-ABBF-40BD4672B58B Key_1 Key_1 @@ -14492,7 +14526,7 @@ LABL 0 新宋体,8,N - + @@ -14506,7 +14540,7 @@ LABL 0 新宋体,8,N 订单中所包含的商品 - + C2ABF8A4-2DE7-4C17-8053-440A60BD8EE7 id id @@ -14518,7 +14552,7 @@ LABL 0 新宋体,8,N 1 1 - + B1934126-97B4-461B-B2A8-D53CCF81245C order_id order_id @@ -14529,7 +14563,7 @@ LABL 0 新宋体,8,N 订单id bigint - + EA411763-23EA-4E27-97CD-1C0D5925157C order_sn order_sn @@ -14541,7 +14575,7 @@ LABL 0 新宋体,8,N varchar(64) 64 - + DCF7D58B-AD64-48B0-9A65-4FDAE9A32DFB product_id product_id @@ -14551,7 +14585,7 @@ LABL 0 新宋体,8,N zhenghong bigint - + 7BDD65C2-224E-413D-AD83-437754569B1C proudct_pic proudct_pic @@ -14562,7 +14596,7 @@ LABL 0 新宋体,8,N varchar(500) 500 - + DFFC50EA-1E9A-4867-9EE8-B1A1B84E51E7 product_name product_name @@ -14573,7 +14607,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + 68478EE9-703A-4DFD-A085-7B109BBF650D product_brand product_brand @@ -14584,7 +14618,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + 27623FBE-2491-4310-AA4E-D93F4AD59154 product_sn product_sn @@ -14595,7 +14629,7 @@ LABL 0 新宋体,8,N varchar(64) 64 - + A9EF8281-439D-4D05-BB45-E933E648D979 product_amount product_amount @@ -14607,7 +14641,7 @@ LABL 0 新宋体,8,N 10 2 - + 015E8942-52BF-4342-9C4C-1230A266C1C9 product_count product_count @@ -14618,7 +14652,7 @@ LABL 0 新宋体,8,N 购买数量 int - + AD7CAE73-04BF-4BB8-BEFA-E0A7B94BF373 product_real_amount product_real_amount @@ -14631,7 +14665,7 @@ LABL 0 新宋体,8,N 10 2 - + 51302EF8-1CD4-43F5-9C02-7920ED857D35 sp1 sp1 @@ -14643,7 +14677,7 @@ LABL 0 新宋体,8,N varchar(100) 100 - + AA056090-3D72-4BAC-A931-CD49C31B9D7E sp2 sp2 @@ -14654,7 +14688,7 @@ LABL 0 新宋体,8,N varchar(100) 100 - + C0CCCE2C-B2C8-44A1-9F6B-771BFE62D760 sp3 sp3 @@ -14667,7 +14701,7 @@ LABL 0 新宋体,8,N - + 8B728C73-2ED3-4C44-8C64-95692A16EA10 Key_1 Key_1 @@ -14676,12 +14710,12 @@ LABL 0 新宋体,8,N 1522660745 zhenghong - + - + @@ -14695,7 +14729,7 @@ LABL 0 新宋体,8,N 订单操作历史记录 - + 46247D13-9B17-44EB-9300-7BA49AC214FB id id @@ -14707,7 +14741,7 @@ LABL 0 新宋体,8,N 1 1 - + CBAA2797-F782-492E-89D8-B87830B4FD86 order_id order_id @@ -14718,7 +14752,7 @@ LABL 0 新宋体,8,N 订单id bigint - + B26D3031-3438-4CAB-BC93-2277F41D2F64 operate_man operate_man @@ -14730,7 +14764,7 @@ LABL 0 新宋体,8,N varchar(100) 100 - + 14B87125-FC24-4D09-982E-F43F618B6C3A create_time create_time @@ -14741,7 +14775,7 @@ LABL 0 新宋体,8,N 操作时间 datetime - + 296A8CF6-1BC8-46E1-846F-25114FF35EEB order_status order_status @@ -14753,7 +14787,7 @@ LABL 0 新宋体,8,N int(1) 1 - + 9F651D4E-088F-4735-ACAD-12ED16C49FDE note note @@ -14767,7 +14801,7 @@ LABL 0 新宋体,8,N - + 50772925-29B2-4E77-A02B-5AB8C229953C Key_1 Key_1 @@ -14776,12 +14810,12 @@ LABL 0 新宋体,8,N 1522725011 zhenghong - + - + @@ -14795,7 +14829,7 @@ LABL 0 新宋体,8,N 订单设置表 - + 03B16432-ECCE-4698-B24A-05554E64C35C id id @@ -14807,7 +14841,7 @@ LABL 0 新宋体,8,N 1 1 - + AC98E6B7-ADDF-43AD-B2F0-6CFE7715E9F1 flash_order_overtime flash_order_overtime @@ -14818,7 +14852,7 @@ LABL 0 新宋体,8,N 秒杀订单超时关闭时间(分) int - + C4E474C5-194A-4B54-8DF1-F37B681DE42B normal_order_overtime normal_order_overtime @@ -14829,7 +14863,7 @@ LABL 0 新宋体,8,N 正常订单超时时间(分) int - + 773FEFCD-F4A3-4D9E-B061-10C12CA1B397 confirm_overtime confirm_overtime @@ -14840,7 +14874,7 @@ LABL 0 新宋体,8,N 发货后自动确认收货时间（天） int - + DD5B89B8-5DC6-4EB1-B916-D76BD75CB0F5 finish_overtime finish_overtime @@ -14851,7 +14885,7 @@ LABL 0 新宋体,8,N 自动完成交易时间，不能申请售后（天） int - + D090D0ED-6A45-445C-ADE3-F1E18734F159 comment_overtime comment_overtime @@ -14864,7 +14898,7 @@ LABL 0 新宋体,8,N - + 7C2ADDA9-1584-4310-A3FE-7F1E18447823 Key_1 Key_1 @@ -14873,12 +14907,12 @@ LABL 0 新宋体,8,N 1522726101 zhenghong - + - + @@ -14892,7 +14926,7 @@ LABL 0 新宋体,8,N 订单退货申请 - + CF99B61C-D0E5-4EB4-BFC6-111A9F3D44E8 id id @@ -14904,7 +14938,7 @@ LABL 0 新宋体,8,N 1 1 - + A6E68B83-006A-468C-A461-C647705E038C order_id order_id @@ -14915,7 +14949,7 @@ LABL 0 新宋体,8,N 订单id bigint - + 8D1F23F9-09FD-416B-8E38-CFDE67721417 company_address_id company_address_id @@ -14925,7 +14959,7 @@ LABL 0 新宋体,8,N zhenghong bigint - + 56ACAE3C-5533-44A1-BA57-602058B6CEF2 order_sn order_sn @@ -14937,7 +14971,7 @@ LABL 0 新宋体,8,N varchar(64) 64 - + F2C78E24-CDB0-4AA7-B6CD-21E55B380E95 create_time create_time @@ -14947,7 +14981,7 @@ LABL 0 新宋体,8,N zhenghong datetime - + 70FBE2CF-BE0D-44DD-8679-39DAA782E1A3 member_username member_username @@ -14958,7 +14992,7 @@ LABL 0 新宋体,8,N varchar(64) 64 - + 7B8A70B3-9FC9-4136-BEC9-D2DF393DB988 return_amount return_amount @@ -14971,7 +15005,7 @@ LABL 0 新宋体,8,N 10 2 - + 4FB9898E-63E4-4B21-B577-504320D3D4F9 return_name return_name @@ -14982,7 +15016,7 @@ LABL 0 新宋体,8,N varchar(100) 100 - + 8ADCC57B-6CA5-4A89-8B5A-6283FE7B3DDF return_phone return_phone @@ -14994,7 +15028,7 @@ LABL 0 新宋体,8,N varchar(100) 100 - + F01CC8D2-508C-424D-BF17-AE42ABE28223 status status @@ -15006,7 +15040,7 @@ LABL 0 新宋体,8,N int(1) 1 - + 65402A2F-A01C-4B4D-9F19-9ACD48637159 handle_time handle_time @@ -15017,7 +15051,7 @@ LABL 0 新宋体,8,N 处理时间 datetime - + AADBD0C8-E8CD-45D6-BDF4-13840EEFA26C product_pic product_pic @@ -15028,7 +15062,7 @@ LABL 0 新宋体,8,N varchar(500) 500 - + B4BB6015-3948-411C-9558-6CAF55CEF04C product_name product_name @@ -15039,7 +15073,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + D30E609F-3F5C-401C-8690-EEA47B0E6694 brand_name brand_name @@ -15050,7 +15084,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + 86B4B2F7-9A36-47AC-A3DA-7F45FFF21639 product_attr product_attr @@ -15062,7 +15096,7 @@ LABL 0 新宋体,8,N varchar(500) 500 - + DE661909-8CDC-4C09-A0C1-5587F969523A product_count product_count @@ -15073,7 +15107,7 @@ LABL 0 新宋体,8,N 退货数量 int - + B4DB3A15-7B0F-4C6D-B961-AF2C4CF14D50 reason reason @@ -15085,7 +15119,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + ECE8A578-4D6B-47EB-BB72-207D9BC93324 description description @@ -15097,7 +15131,7 @@ LABL 0 新宋体,8,N varchar(500) 500 - + E3C2C9CF-D72D-44AA-B1A3-5B5AC1950B63 proof_pics proof_pics @@ -15109,7 +15143,7 @@ LABL 0 新宋体,8,N varchar(1000) 1000 - + 4647C7DC-D2B4-48B7-B5F3-4524FBAAD875 return_post_amount return_post_amount @@ -15122,7 +15156,7 @@ LABL 0 新宋体,8,N 10 2 - + 8361AE87-5DC4-470B-B12E-4A2EF7708701 return_post_status return_post_status @@ -15134,7 +15168,7 @@ LABL 0 新宋体,8,N int(1) 1 - + 3870169D-4A55-444E-9574-19FB829E9CB8 confirm_return_amount confirm_return_amount @@ -15147,7 +15181,7 @@ LABL 0 新宋体,8,N 10 2 - + B16F27C1-DFFA-40F1-83B5-F9DA3BB86FE6 handle_note handle_note @@ -15159,7 +15193,7 @@ LABL 0 新宋体,8,N varchar(500) 500 - + B8982C29-EB0D-4F63-A047-DDEDC91A78C3 handle_man handle_man @@ -15171,7 +15205,7 @@ LABL 0 新宋体,8,N varchar(100) 100 - + 49E217E2-31BF-4F23-8125-62D5920E0B60 receive_man receive_man @@ -15183,7 +15217,7 @@ LABL 0 新宋体,8,N varchar(100) 100 - + 8111E4F5-B8EA-4DCB-B899-A2E4921E6BC2 receive_time receive_time @@ -15193,7 +15227,7 @@ LABL 0 新宋体,8,N zhenghong datetime - + 4C802C73-FB19-4C09-84C3-37E152CA8299 receive_note receive_note @@ -15206,7 +15240,7 @@ LABL 0 新宋体,8,N - + D06B934B-B63D-4DCC-B1C1-62F79744A8AC Key_1 Key_1 @@ -15215,12 +15249,12 @@ LABL 0 新宋体,8,N 1522732939 zhenghong - + - + @@ -15234,7 +15268,7 @@ LABL 0 新宋体,8,N 公司收发货地址表 - + F5A62BE4-F0B9-46C3-8591-5864BB83220D id id @@ -15246,7 +15280,7 @@ LABL 0 新宋体,8,N 1 1 - + 359C7F83-8810-4F75-935C-8099B75676C6 address_name address_name @@ -15258,7 +15292,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + 5AA8AC8B-9617-4A6F-B898-4206F7CE8169 send_status send_status @@ -15270,7 +15304,7 @@ LABL 0 新宋体,8,N int(1) 1 - + CDF1655B-32CC-4E54-BBE7-5F00549B7722 receive_status receive_status @@ -15282,7 +15316,7 @@ LABL 0 新宋体,8,N int(1) 1 - + F5195500-8663-482B-B587-27789546188C name name @@ -15294,7 +15328,7 @@ LABL 0 新宋体,8,N varchar(64) 64 - + D51012F2-BECB-4E6B-A7E9-5B6AC06D9087 phone phone @@ -15306,7 +15340,7 @@ LABL 0 新宋体,8,N varchar(64) 64 - + 3D2DC8D4-9D56-4E95-8266-052132761CDE province province @@ -15317,7 +15351,7 @@ LABL 0 新宋体,8,N varchar(64) 64 - + 57267BF2-434D-4AEC-8E6B-DDCAA85233F7 city city @@ -15328,7 +15362,7 @@ LABL 0 新宋体,8,N varchar(64) 64 - + F1F15023-139B-4048-8D0C-C9C46884C6E9 region region @@ -15341,7 +15375,7 @@ LABL 0 新宋体,8,N - + 9B8E57D5-D022-48D7-BA87-3214D2DAB1BD Key_1 Key_1 @@ -15350,12 +15384,12 @@ LABL 0 新宋体,8,N 1522745192 zhenghong - + - + @@ -15369,7 +15403,7 @@ LABL 0 新宋体,8,N 退货原因表 - + 8398CF1C-2327-4762-B370-7F7BB681FBE8 id id @@ -15381,7 +15415,7 @@ LABL 0 新宋体,8,N 1 1 - + 7C7CCC5E-FBE6-49A6-A428-95A8A078B4EA name name @@ -15393,7 +15427,7 @@ LABL 0 新宋体,8,N varchar(100) 100 - + 0C284FC4-E892-4BFF-B0AC-AD9BCB8E39D2 sort sort @@ -15403,7 +15437,7 @@ LABL 0 新宋体,8,N zhenghong int - + D0151FA2-84E3-4252-9565-766B748B7AD3 status status @@ -15417,7 +15451,7 @@ LABL 0 新宋体,8,N - + F0009D1F-CC14-45AA-BDB7-F25CFBBFE380 Key_1 Key_1 @@ -15426,12 +15460,12 @@ LABL 0 新宋体,8,N 1533115911 zhenghong - + - + @@ -15445,7 +15479,7 @@ LABL 0 新宋体,8,N 购物车表 - + 0496CCD8-F7CC-4DD4-AEE7-919D8EFCD676 id id @@ -15457,7 +15491,7 @@ LABL 0 新宋体,8,N 1 1 - + BC6AB2CA-354D-447A-A466-54980B87F57F product_id product_id @@ -15467,7 +15501,7 @@ LABL 0 新宋体,8,N zhenghong bigint - + 48241AB2-A6B4-48E5-A792-FAB72D97FD42 product_sku_id product_sku_id @@ -15477,7 +15511,7 @@ LABL 0 新宋体,8,N zhenghong bigint - + 70CEB9F6-7F7D-4AB1-BB9D-3667BA109C72 member_id member_id @@ -15487,7 +15521,7 @@ LABL 0 新宋体,8,N zhenghong bigint - + 8B8B68C0-7987-4E2B-9BAD-FF4F3428E03A quantity quantity @@ -15498,7 +15532,7 @@ LABL 0 新宋体,8,N 购买数量 int - + E2A71768-48C5-46B2-82B8-635169BFE66D price price @@ -15511,7 +15545,7 @@ LABL 0 新宋体,8,N 10 2 - + 1EB6341A-F163-4763-8A41-99BB5914189A sp1 sp1 @@ -15523,7 +15557,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + 10C79639-93BE-48F3-B2A4-98AC7C338882 sp2 sp2 @@ -15535,7 +15569,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + 629EE7D7-D006-4AB6-8EF9-0B30E4283004 sp3 sp3 @@ -15547,7 +15581,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + B5A53CF7-C87D-411B-89DF-41888E2722C7 product_pic product_pic @@ -15559,7 +15593,7 @@ LABL 0 新宋体,8,N varchar(1000) 1000 - + E1A4F06D-34AE-4B0C-BCC6-F82BA9D1A76F product_name product_name @@ -15571,7 +15605,7 @@ LABL 0 新宋体,8,N varchar(500) 500 - + 2D4BFCEF-83F1-4697-8EF7-DCC5D2A9491D product_sub_title product_sub_title @@ -15583,7 +15617,7 @@ LABL 0 新宋体,8,N varchar(500) 500 - + 8A7E5878-BB5E-49F3-BE20-E6986E172BB3 product_sku_code product_sku_code @@ -15595,7 +15629,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + 23C68713-D38A-4915-96E3-A9762199D386 member_nickname member_nickname @@ -15607,7 +15641,7 @@ LABL 0 新宋体,8,N varchar(500) 500 - + 5675315C-7265-4AC3-88D4-BC1525AC73B7 create_date create_date @@ -15618,7 +15652,7 @@ LABL 0 新宋体,8,N 创建时间 datetime - + 1D877A06-39CD-4A3C-B4A8-059588D13838 modify_date modify_date @@ -15629,7 +15663,7 @@ LABL 0 新宋体,8,N 修改时间 datetime - + 20EF4C13-435F-4C03-B8A9-7E31F1432E21 delete_status delete_status @@ -15642,7 +15676,7 @@ LABL 0 新宋体,8,N int(1) 1 - + 9C9C2AC9-F58B-4D31-BEF4-1D1892931E51 product_category_id product_category_id @@ -15655,7 +15689,7 @@ LABL 0 新宋体,8,N - + 29D735B7-E618-4C13-AF03-3858C68E6BA4 Key_1 Key_1 @@ -15664,12 +15698,12 @@ LABL 0 新宋体,8,N 1533108680 zhenghong - + - + @@ -15695,7 +15729,7 @@ LABL 0 新宋体,8,N - + 5236F74C-2761-4AC4-834A-BECC5D040393 1521706257 zhenghong @@ -15731,7 +15765,7 @@ LABL 0 新宋体,8,N - + 6EE78803-E5F6-4090-B810-7BBF7814F60C 1521710488 zhenghong @@ -15767,7 +15801,7 @@ LABL 0 新宋体,8,N - + 84F722B4-DF57-4BC3-88FD-B249B70D21A7 1521770349 zhenghong @@ -15803,7 +15837,7 @@ LABL 0 新宋体,8,N - + 0309D83E-51C3-4973-A636-9FEB27F4A6B6 1521771362 zhenghong @@ -15839,7 +15873,7 @@ LABL 0 新宋体,8,N - + 7B820697-9FFD-4446-B6DF-F03F4F02FFE3 1521773101 zhenghong @@ -15875,7 +15909,7 @@ LABL 0 新宋体,8,N - + 13DDC5F6-372D-47FF-AAFA-8AEF349E7FA8 1521783613 zhenghong @@ -15911,7 +15945,7 @@ LABL 0 新宋体,8,N - + 31ADEBC6-F176-41A7-8EAA-9AC3B8A253AB 1521791466 zhenghong @@ -15947,7 +15981,7 @@ LABL 0 新宋体,8,N - + F2B169B3-7AC8-4FB1-822D-E1C91DFF6FFD 1521792428 zhenghong @@ -15983,7 +16017,7 @@ LABL 0 新宋体,8,N - + 00AD7B43-F4CA-45D7-86BB-5756B4ED55BD 1521792909 zhenghong @@ -16019,7 +16053,7 @@ LABL 0 新宋体,8,N - + 286E06C6-6FAD-4323-82D9-6FB781153C46 1522045168 zhenghong @@ -16055,7 +16089,7 @@ LABL 0 新宋体,8,N - + A2161167-D453-4661-9BF0-71D8908A6C42 1522046100 zhenghong @@ -16091,7 +16125,7 @@ LABL 0 新宋体,8,N - + E25FF0B6-41E2-4801-8FE9-337EF9B991F7 1522046451 zhenghong @@ -16127,7 +16161,7 @@ LABL 0 新宋体,8,N - + 1E64FE44-48BA-49B0-BDE1-66DA22B89EFF 1522046456 zhenghong @@ -16163,7 +16197,7 @@ LABL 0 新宋体,8,N - + DEE74089-6A6D-4D7E-BADD-76E4D08EFA2D 1522112691 zhenghong @@ -16199,7 +16233,7 @@ LABL 0 新宋体,8,N - + 5D44A212-AD69-4958-BAAF-9E16ED63FC67 1522112694 zhenghong @@ -16235,7 +16269,7 @@ LABL 0 新宋体,8,N - + ECA8F78C-7015-44EB-9CD2-F72634D7F4BD 1522114406 zhenghong @@ -16271,7 +16305,7 @@ LABL 0 新宋体,8,N - + 32BD37D4-4436-4069-9BD1-90CF0B1867E0 1522115961 zhenghong @@ -16307,7 +16341,7 @@ LABL 0 新宋体,8,N - + 1A23B754-71EE-4496-B70F-0A3268C6F651 1522115983 zhenghong @@ -16343,7 +16377,7 @@ LABL 0 新宋体,8,N - + 1C883E67-84F9-4CD0-A4F5-D7CA2BE15DC5 1522118676 zhenghong @@ -16379,7 +16413,7 @@ LABL 0 新宋体,8,N - + 1CE2FCCB-DF37-4C88-99DD-FA8C3EE7A09C 1522119056 zhenghong @@ -16415,7 +16449,7 @@ LABL 0 新宋体,8,N - + 7D8DC4F2-D0A4-4CE9-B03E-44AE166786C0 1522120295 zhenghong @@ -16451,7 +16485,7 @@ LABL 0 新宋体,8,N - + 7CB99F50-753B-4347-B896-1F18D8FE6691 1522138613 zhenghong @@ -16487,7 +16521,7 @@ LABL 0 新宋体,8,N - + EC89DA87-A575-4940-973B-665854268261 1522138618 zhenghong @@ -16523,7 +16557,7 @@ LABL 0 新宋体,8,N - + 8E1A22EC-2246-48C4-A499-3D8A4D264C09 1522138705 zhenghong @@ -16559,7 +16593,7 @@ LABL 0 新宋体,8,N - + 2EA7348D-C8E8-4FCC-8215-01FE3AD58DFB 1522141157 zhenghong @@ -16595,7 +16629,7 @@ LABL 0 新宋体,8,N - + 8B858AAC-D00A-42FE-BEDC-73536876C045 1522141232 zhenghong @@ -16631,7 +16665,7 @@ LABL 0 新宋体,8,N - + FC3A22FE-FD24-4DF0-BAC8-22659D3C8987 1522141317 zhenghong @@ -16667,7 +16701,7 @@ LABL 0 新宋体,8,N - + 14DB9C0C-F9F0-4D4A-B44E-592028F6E75A 1522142006 zhenghong @@ -16703,7 +16737,7 @@ LABL 0 新宋体,8,N - + 15304E84-71AA-40B1-84CB-904384B34B25 1522215975 zhenghong @@ -16739,7 +16773,7 @@ LABL 0 新宋体,8,N - + 457237AD-87EB-4A09-BA9F-36198B10D2FF 1522216015 zhenghong @@ -16775,7 +16809,7 @@ LABL 0 新宋体,8,N - + 3C2E5F27-A07C-4D88-9357-089D36122A25 1522216251 zhenghong @@ -16811,7 +16845,7 @@ LABL 0 新宋体,8,N - + A8FA4798-0F1E-4D96-A254-77F5D71F6BBD 1522216380 zhenghong @@ -16847,7 +16881,7 @@ LABL 0 新宋体,8,N - + 5026171A-4B51-4B83-A113-4051F1E4F415 1522220508 zhenghong @@ -16883,7 +16917,7 @@ LABL 0 新宋体,8,N - + 462222B9-A203-4D60-A353-A168356E3140 1522220546 zhenghong @@ -16919,7 +16953,7 @@ LABL 0 新宋体,8,N - + BD28F911-4F98-4C9D-9171-E99F60476E2A 1522224364 zhenghong @@ -16955,7 +16989,7 @@ LABL 0 新宋体,8,N - + 8D1675C9-7749-4831-A5E6-ACD971AACF57 1522225874 zhenghong @@ -16991,7 +17025,7 @@ LABL 0 新宋体,8,N - + B30347B3-4138-4EA8-A0F5-EF0D9A34E01F 1522226077 zhenghong @@ -17027,7 +17061,7 @@ LABL 0 新宋体,8,N - + 7D29D8DF-7EF1-4F43-928F-DDAC96A23858 1522226272 zhenghong @@ -17063,7 +17097,7 @@ LABL 0 新宋体,8,N - + EB0A7FB4-285A-4D5D-BC1D-E9B299069C1F 1522301998 zhenghong @@ -17099,7 +17133,7 @@ LABL 0 新宋体,8,N - + 942BBD31-85B8-46EA-893C-CB327C86F5BA 1522303390 zhenghong @@ -17135,7 +17169,7 @@ LABL 0 新宋体,8,N - + 1E5174EE-C0B0-4144-98D5-679634DCCAEE 1522303410 zhenghong @@ -17171,7 +17205,7 @@ LABL 0 新宋体,8,N - + BD55704C-3F36-44CC-90E1-143F097FA894 1522304178 zhenghong @@ -17207,7 +17241,7 @@ LABL 0 新宋体,8,N - + 17EC5CAA-580C-493D-9C2D-2EA3E9732A78 1522386868 zhenghong @@ -17243,7 +17277,7 @@ LABL 0 新宋体,8,N - + F469B162-D88C-42A3-B64C-7B2751A4FCE1 1522387461 zhenghong @@ -17279,7 +17313,7 @@ LABL 0 新宋体,8,N - + 1D18BF30-4375-4618-A1C9-6DC998F248E4 1522387526 zhenghong @@ -17315,7 +17349,7 @@ LABL 0 新宋体,8,N - + 183F9969-663E-4842-ABC2-C938F02C05E4 1522389232 zhenghong @@ -17351,7 +17385,7 @@ LABL 0 新宋体,8,N - + AC355266-228D-4333-8E95-D13F2D176DB4 1522390434 zhenghong @@ -17387,7 +17421,7 @@ LABL 0 新宋体,8,N - + 3A358827-AE90-4AC6-80E6-CA340D69F7F2 1522390644 zhenghong @@ -17423,7 +17457,7 @@ LABL 0 新宋体,8,N - + B0F12E0B-F2E6-40A6-AD2B-9FE858AAA8BE 1522391366 zhenghong @@ -17459,7 +17493,7 @@ LABL 0 新宋体,8,N - + F46C48A9-78A1-4C9A-BD75-DE0ED230A76D 1522391379 zhenghong @@ -17495,7 +17529,7 @@ LABL 0 新宋体,8,N - + 711AD4D5-212E-4E3B-BB26-DB79C4BE4E52 1522396648 zhenghong @@ -17531,7 +17565,7 @@ LABL 0 新宋体,8,N - + 094B7BE5-D0AB-4987-8D74-508A27D3117F 1522396864 zhenghong @@ -17567,7 +17601,7 @@ LABL 0 新宋体,8,N - + 8C15D427-62A0-40E7-9B02-84063CC6EB94 1522659209 zhenghong @@ -17600,10 +17634,10 @@ LABL 0 新宋体,8,N - + - + 043B7E7F-6688-42FD-BECE-3A4CE5A560F2 1522660753 zhenghong @@ -17613,7 +17647,7 @@ LABL 0 新宋体,8,N - + @@ -17639,7 +17673,7 @@ LABL 0 新宋体,8,N - + 3592DAA0-2C95-48CF-9359-C157A0E27DC3 1522660820 zhenghong @@ -17649,7 +17683,7 @@ LABL 0 新宋体,8,N - + @@ -17675,7 +17709,7 @@ LABL 0 新宋体,8,N - + BEE8D279-8DBF-40B3-899D-5B07570D0AD9 1522721755 zhenghong @@ -17711,7 +17745,7 @@ LABL 0 新宋体,8,N - + F5D0566A-35C3-4451-9C7D-782BC776C53E 1522724329 zhenghong @@ -17744,10 +17778,10 @@ LABL 0 新宋体,8,N - + - + 3AA8813B-9363-406A-91DF-4AD16E9C3CCA 1522725331 zhenghong @@ -17757,7 +17791,7 @@ LABL 0 新宋体,8,N - + @@ -17780,10 +17814,10 @@ LABL 0 新宋体,8,N - + - + DD05624A-7E08-4273-9758-C5EDA1A03134 1522733188 zhenghong @@ -17793,7 +17827,7 @@ LABL 0 新宋体,8,N - + @@ -17816,20 +17850,20 @@ LABL 0 新宋体,8,N - + - + EBF8A4B9-24B3-4D18-82FD-D12F847328C6 1522745521 zhenghong 1522745521 zhenghong - + - + @@ -17855,7 +17889,7 @@ LABL 0 新宋体,8,N - + BA7665F0-D173-45C6-AFE8-3C93CF330D79 1533109970 zhenghong @@ -17865,7 +17899,7 @@ LABL 0 新宋体,8,N - + @@ -17891,7 +17925,7 @@ LABL 0 新宋体,8,N - + 521484A5-B9C4-477D-8D45-97F7B15D7854 1533115829 zhenghong @@ -17901,7 +17935,7 @@ LABL 0 新宋体,8,N - + @@ -17927,7 +17961,7 @@ LABL 0 新宋体,8,N - + FCADB7B3-0636-44C7-8AB4-067148971867 1533115896 zhenghong @@ -17937,14 +17971,14 @@ LABL 0 新宋体,8,N - + - + 48492A0F-63AD-4453-B46B-89915CC87545 PUBLIC PUBLIC @@ -17955,7 +17989,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/mapper/UmsIntegrationConsumeSettingMapper.java b/mall-mbg/src/main/java/com/macro/mall/mapper/UmsIntegrationConsumeSettingMapper.java new file mode 100644 index 0000000..323d20f --- /dev/null +++ b/mall-mbg/src/main/java/com/macro/mall/mapper/UmsIntegrationConsumeSettingMapper.java @@ -0,0 +1,30 @@ +package com.macro.mall.mapper; + +import com.macro.mall.model.UmsIntegrationConsumeSetting; +import com.macro.mall.model.UmsIntegrationConsumeSettingExample; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface UmsIntegrationConsumeSettingMapper { + int countByExample(UmsIntegrationConsumeSettingExample example); + + int deleteByExample(UmsIntegrationConsumeSettingExample example); + + int deleteByPrimaryKey(Long id); + + int insert(UmsIntegrationConsumeSetting record); + + int insertSelective(UmsIntegrationConsumeSetting record); + + List selectByExample(UmsIntegrationConsumeSettingExample example); + + UmsIntegrationConsumeSetting selectByPrimaryKey(Long id); + + int updateByExampleSelective(@Param("record") UmsIntegrationConsumeSetting record, @Param("example") UmsIntegrationConsumeSettingExample example); + + int updateByExample(@Param("record") UmsIntegrationConsumeSetting record, @Param("example") UmsIntegrationConsumeSettingExample example); + + int updateByPrimaryKeySelective(UmsIntegrationConsumeSetting record); + + int updateByPrimaryKey(UmsIntegrationConsumeSetting record); +} \ No newline at end of file diff --git a/mall-mbg/src/main/java/com/macro/mall/mapper/UmsIntergrationConsumeSettingMapper.java b/mall-mbg/src/main/java/com/macro/mall/mapper/UmsIntergrationConsumeSettingMapper.java deleted file mode 100644 index 3405361..0000000 --- a/mall-mbg/src/main/java/com/macro/mall/mapper/UmsIntergrationConsumeSettingMapper.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.macro.mall.mapper; - -import com.macro.mall.model.UmsIntergrationConsumeSetting; -import com.macro.mall.model.UmsIntergrationConsumeSettingExample; -import java.util.List; -import org.apache.ibatis.annotations.Param; - -public interface UmsIntergrationConsumeSettingMapper { - int countByExample(UmsIntergrationConsumeSettingExample example); - - int deleteByExample(UmsIntergrationConsumeSettingExample example); - - int deleteByPrimaryKey(Long id); - - int insert(UmsIntergrationConsumeSetting record); - - int insertSelective(UmsIntergrationConsumeSetting record); - - List selectByExample(UmsIntergrationConsumeSettingExample example); - - UmsIntergrationConsumeSetting selectByPrimaryKey(Long id); - - int updateByExampleSelective(@Param("record") UmsIntergrationConsumeSetting record, @Param("example") UmsIntergrationConsumeSettingExample example); - - int updateByExample(@Param("record") UmsIntergrationConsumeSetting record, @Param("example") UmsIntergrationConsumeSettingExample example); - - int updateByPrimaryKeySelective(UmsIntergrationConsumeSetting record); - - int updateByPrimaryKey(UmsIntergrationConsumeSetting record); -} \ No newline at end of file diff --git a/mall-mbg/src/main/java/com/macro/mall/model/OmsOrder.java b/mall-mbg/src/main/java/com/macro/mall/model/OmsOrder.java index 7675758..852267a 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/OmsOrder.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/OmsOrder.java @@ -44,6 +44,13 @@ public class OmsOrder implements Serializable { */ private BigDecimal totalAmount; + /** + * 应付金额（实际支付金额） + * + * @mbggenerated + */ + private BigDecimal payAmount; + /** * 运费金额 * @@ -247,6 +254,13 @@ public class OmsOrder implements Serializable { */ private Integer confirmStatus; + /** + * 删除状态：0->未删除；1->已删除 + * + * @mbggenerated + */ + private Integer deleteStatus; + private static final long serialVersionUID = 1L; public Long getId() { @@ -305,6 +319,14 @@ public class OmsOrder implements Serializable { this.totalAmount = totalAmount; } + public BigDecimal getPayAmount() { + return payAmount; + } + + public void setPayAmount(BigDecimal payAmount) { + this.payAmount = payAmount; + } + public BigDecimal getFreightAmount() { return freightAmount; } @@ -537,6 +559,14 @@ public class OmsOrder implements Serializable { this.confirmStatus = confirmStatus; } + public Integer getDeleteStatus() { + return deleteStatus; + } + + public void setDeleteStatus(Integer deleteStatus) { + this.deleteStatus = deleteStatus; + } + @Override public String toString() { StringBuilder sb = new StringBuilder(); @@ -550,6 +580,7 @@ public class OmsOrder implements Serializable { sb.append(", createTime=").append(createTime); sb.append(", memberUsername=").append(memberUsername); sb.append(", totalAmount=").append(totalAmount); + sb.append(", payAmount=").append(payAmount); sb.append(", freightAmount=").append(freightAmount); sb.append(", promotionAmount=").append(promotionAmount); sb.append(", integrationAmount=").append(integrationAmount); @@ -579,6 +610,7 @@ public class OmsOrder implements Serializable { sb.append(", receiverDetailAddress=").append(receiverDetailAddress); sb.append(", note=").append(note); sb.append(", confirmStatus=").append(confirmStatus); + sb.append(", deleteStatus=").append(deleteStatus); sb.append(", serialVersionUID=").append(serialVersionUID); sb.append("]"); return sb.toString(); diff --git a/mall-mbg/src/main/java/com/macro/mall/model/OmsOrderExample.java b/mall-mbg/src/main/java/com/macro/mall/model/OmsOrderExample.java index 64ed4cb..228a0fc 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/OmsOrderExample.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/OmsOrderExample.java @@ -546,6 +546,66 @@ public class OmsOrderExample { return (Criteria) this; } + public Criteria andPayAmountIsNull() { + addCriterion("pay_amount is null"); + return (Criteria) this; + } + + public Criteria andPayAmountIsNotNull() { + addCriterion("pay_amount is not null"); + return (Criteria) this; + } + + public Criteria andPayAmountEqualTo(BigDecimal value) { + addCriterion("pay_amount =", value, "payAmount"); + return (Criteria) this; + } + + public Criteria andPayAmountNotEqualTo(BigDecimal value) { + addCriterion("pay_amount <>", value, "payAmount"); + return (Criteria) this; + } + + public Criteria andPayAmountGreaterThan(BigDecimal value) { + addCriterion("pay_amount >", value, "payAmount"); + return (Criteria) this; + } + + public Criteria andPayAmountGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("pay_amount >=", value, "payAmount"); + return (Criteria) this; + } + + public Criteria andPayAmountLessThan(BigDecimal value) { + addCriterion("pay_amount <", value, "payAmount"); + return (Criteria) this; + } + + public Criteria andPayAmountLessThanOrEqualTo(BigDecimal value) { + addCriterion("pay_amount <=", value, "payAmount"); + return (Criteria) this; + } + + public Criteria andPayAmountIn(List values) { + addCriterion("pay_amount in", values, "payAmount"); + return (Criteria) this; + } + + public Criteria andPayAmountNotIn(List values) { + addCriterion("pay_amount not in", values, "payAmount"); + return (Criteria) this; + } + + public Criteria andPayAmountBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("pay_amount between", value1, value2, "payAmount"); + return (Criteria) this; + } + + public Criteria andPayAmountNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("pay_amount not between", value1, value2, "payAmount"); + return (Criteria) this; + } + public Criteria andFreightAmountIsNull() { addCriterion("freight_amount is null"); return (Criteria) this; @@ -2435,6 +2495,66 @@ public class OmsOrderExample { addCriterion("confirm_status not between", value1, value2, "confirmStatus"); return (Criteria) this; } + + public Criteria andDeleteStatusIsNull() { + addCriterion("delete_status is null"); + return (Criteria) this; + } + + public Criteria andDeleteStatusIsNotNull() { + addCriterion("delete_status is not null"); + return (Criteria) this; + } + + public Criteria andDeleteStatusEqualTo(Integer value) { + addCriterion("delete_status =", value, "deleteStatus"); + return (Criteria) this; + } + + public Criteria andDeleteStatusNotEqualTo(Integer value) { + addCriterion("delete_status <>", value, "deleteStatus"); + return (Criteria) this; + } + + public Criteria andDeleteStatusGreaterThan(Integer value) { + addCriterion("delete_status >", value, "deleteStatus"); + return (Criteria) this; + } + + public Criteria andDeleteStatusGreaterThanOrEqualTo(Integer value) { + addCriterion("delete_status >=", value, "deleteStatus"); + return (Criteria) this; + } + + public Criteria andDeleteStatusLessThan(Integer value) { + addCriterion("delete_status <", value, "deleteStatus"); + return (Criteria) this; + } + + public Criteria andDeleteStatusLessThanOrEqualTo(Integer value) { + addCriterion("delete_status <=", value, "deleteStatus"); + return (Criteria) this; + } + + public Criteria andDeleteStatusIn(List values) { + addCriterion("delete_status in", values, "deleteStatus"); + return (Criteria) this; + } + + public Criteria andDeleteStatusNotIn(List values) { + addCriterion("delete_status not in", values, "deleteStatus"); + return (Criteria) this; + } + + public Criteria andDeleteStatusBetween(Integer value1, Integer value2) { + addCriterion("delete_status between", value1, value2, "deleteStatus"); + return (Criteria) this; + } + + public Criteria andDeleteStatusNotBetween(Integer value1, Integer value2) { + addCriterion("delete_status not between", value1, value2, "deleteStatus"); + return (Criteria) this; + } } public static class Criteria extends GeneratedCriteria { diff --git a/mall-mbg/src/main/java/com/macro/mall/model/UmsIntergrationConsumeSetting.java b/mall-mbg/src/main/java/com/macro/mall/model/UmsIntegrationConsumeSetting.java similarity index 96% rename from mall-mbg/src/main/java/com/macro/mall/model/UmsIntergrationConsumeSetting.java rename to mall-mbg/src/main/java/com/macro/mall/model/UmsIntegrationConsumeSetting.java index 682c1d2..ebd3852 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/UmsIntergrationConsumeSetting.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/UmsIntegrationConsumeSetting.java @@ -2,7 +2,7 @@ package com.macro.mall.model; import java.io.Serializable; -public class UmsIntergrationConsumeSetting implements Serializable { +public class UmsIntegrationConsumeSetting implements Serializable { private Long id; /** diff --git a/mall-mbg/src/main/java/com/macro/mall/model/UmsIntergrationConsumeSettingExample.java b/mall-mbg/src/main/java/com/macro/mall/model/UmsIntegrationConsumeSettingExample.java similarity index 99% rename from mall-mbg/src/main/java/com/macro/mall/model/UmsIntergrationConsumeSettingExample.java rename to mall-mbg/src/main/java/com/macro/mall/model/UmsIntegrationConsumeSettingExample.java index 3bc45a8..7908264 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/UmsIntergrationConsumeSettingExample.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/UmsIntegrationConsumeSettingExample.java @@ -3,14 +3,14 @@ package com.macro.mall.model; import java.util.ArrayList; import java.util.List; -public class UmsIntergrationConsumeSettingExample { +public class UmsIntegrationConsumeSettingExample { protected String orderByClause; protected boolean distinct; protected List oredCriteria; - public UmsIntergrationConsumeSettingExample() { + public UmsIntegrationConsumeSettingExample() { oredCriteria = new ArrayList(); } diff --git a/mall-mbg/src/main/resources/com/macro/mall/mapper/OmsOrderMapper.xml b/mall-mbg/src/main/resources/com/macro/mall/mapper/OmsOrderMapper.xml index c2ac7fe..5946330 100644 --- a/mall-mbg/src/main/resources/com/macro/mall/mapper/OmsOrderMapper.xml +++ b/mall-mbg/src/main/resources/com/macro/mall/mapper/OmsOrderMapper.xml @@ -9,6 +9,7 @@ + @@ -38,6 +39,7 @@ + @@ -98,12 +100,12 @@ - id, member_id, coupon_id, order_sn, create_time, member_username, total_amount, freight_amount, - promotion_amount, integration_amount, coupon_amount, discount_amount, pay_type, source_type, - status, order_type, delivery_company, delivery_sn, auto_confirm_day, integration, - growth, promotion_info, bill_type, bill_header, bill_content, bill_receiver_phone, + id, member_id, coupon_id, order_sn, create_time, member_username, total_amount, pay_amount, + freight_amount, promotion_amount, integration_amount, coupon_amount, discount_amount, + pay_type, source_type, status, order_type, delivery_company, delivery_sn, auto_confirm_day, + integration, growth, promotion_info, bill_type, bill_header, bill_content, bill_receiver_phone, bill_receiver_email, receiver_name, receiver_phone, receiver_post_code, receiver_province, - receiver_city, receiver_region, receiver_detail_address, note, confirm_status + receiver_city, receiver_region, receiver_detail_address, note, confirm_status, delete_status @@ -414,6 +430,9 @@ total_amount = #{record.totalAmount,jdbcType=DECIMAL}, + + pay_amount = #{record.payAmount,jdbcType=DECIMAL}, + freight_amount = #{record.freightAmount,jdbcType=DECIMAL}, @@ -501,6 +520,9 @@ confirm_status = #{record.confirmStatus,jdbcType=INTEGER}, + + delete_status = #{record.deleteStatus,jdbcType=INTEGER}, + @@ -515,6 +537,7 @@ create_time = #{record.createTime,jdbcType=TIMESTAMP}, member_username = #{record.memberUsername,jdbcType=VARCHAR}, total_amount = #{record.totalAmount,jdbcType=DECIMAL}, + pay_amount = #{record.payAmount,jdbcType=DECIMAL}, freight_amount = #{record.freightAmount,jdbcType=DECIMAL}, promotion_amount = #{record.promotionAmount,jdbcType=DECIMAL}, integration_amount = #{record.integrationAmount,jdbcType=DECIMAL}, @@ -543,7 +566,8 @@ receiver_region = #{record.receiverRegion,jdbcType=VARCHAR}, receiver_detail_address = #{record.receiverDetailAddress,jdbcType=VARCHAR}, note = #{record.note,jdbcType=VARCHAR}, - confirm_status = #{record.confirmStatus,jdbcType=INTEGER} + confirm_status = #{record.confirmStatus,jdbcType=INTEGER}, + delete_status = #{record.deleteStatus,jdbcType=INTEGER} @@ -569,6 +593,9 @@ total_amount = #{totalAmount,jdbcType=DECIMAL}, + + pay_amount = #{payAmount,jdbcType=DECIMAL}, + freight_amount = #{freightAmount,jdbcType=DECIMAL}, @@ -656,6 +683,9 @@ confirm_status = #{confirmStatus,jdbcType=INTEGER}, + + delete_status = #{deleteStatus,jdbcType=INTEGER}, + where id = #{id,jdbcType=BIGINT} @@ -667,6 +697,7 @@ create_time = #{createTime,jdbcType=TIMESTAMP}, member_username = #{memberUsername,jdbcType=VARCHAR}, total_amount = #{totalAmount,jdbcType=DECIMAL}, + pay_amount = #{payAmount,jdbcType=DECIMAL}, freight_amount = #{freightAmount,jdbcType=DECIMAL}, promotion_amount = #{promotionAmount,jdbcType=DECIMAL}, integration_amount = #{integrationAmount,jdbcType=DECIMAL}, @@ -695,7 +726,8 @@ receiver_region = #{receiverRegion,jdbcType=VARCHAR}, receiver_detail_address = #{receiverDetailAddress,jdbcType=VARCHAR}, note = #{note,jdbcType=VARCHAR}, - confirm_status = #{confirmStatus,jdbcType=INTEGER} + confirm_status = #{confirmStatus,jdbcType=INTEGER}, + delete_status = #{deleteStatus,jdbcType=INTEGER} where id = #{id,jdbcType=BIGINT} \ No newline at end of file diff --git a/mall-mbg/src/main/resources/com/macro/mall/mapper/UmsIntergrationConsumeSettingMapper.xml b/mall-mbg/src/main/resources/com/macro/mall/mapper/UmsIntegrationConsumeSettingMapper.xml similarity index 88% rename from mall-mbg/src/main/resources/com/macro/mall/mapper/UmsIntergrationConsumeSettingMapper.xml rename to mall-mbg/src/main/resources/com/macro/mall/mapper/UmsIntegrationConsumeSettingMapper.xml index 02cd39e..eae1c7a 100644 --- a/mall-mbg/src/main/resources/com/macro/mall/mapper/UmsIntergrationConsumeSettingMapper.xml +++ b/mall-mbg/src/main/resources/com/macro/mall/mapper/UmsIntegrationConsumeSettingMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -69,13 +69,13 @@ id, deduction_per_amount, max_percent_per_order, use_unit, coupon_status - select distinct - from ums_intergration_consume_setting + from ums_integration_consume_setting @@ -86,33 +86,33 @@ - delete from ums_intergration_consume_setting + delete from ums_integration_consume_setting where id = #{id,jdbcType=BIGINT} - - delete from ums_intergration_consume_setting + + delete from ums_integration_consume_setting - + SELECT LAST_INSERT_ID() - insert into ums_intergration_consume_setting (deduction_per_amount, max_percent_per_order, + insert into ums_integration_consume_setting (deduction_per_amount, max_percent_per_order, use_unit, coupon_status) values (#{deductionPerAmount,jdbcType=INTEGER}, #{maxPercentPerOrder,jdbcType=INTEGER}, #{useUnit,jdbcType=INTEGER}, #{couponStatus,jdbcType=INTEGER}) - + SELECT LAST_INSERT_ID() - insert into ums_intergration_consume_setting + insert into ums_integration_consume_setting deduction_per_amount, @@ -142,14 +142,14 @@ - + select count(*) from ums_integration_consume_setting - update ums_intergration_consume_setting + update ums_integration_consume_setting id = #{record.id,jdbcType=BIGINT}, @@ -172,7 +172,7 @@ - update ums_intergration_consume_setting + update ums_integration_consume_setting set id = #{record.id,jdbcType=BIGINT}, deduction_per_amount = #{record.deductionPerAmount,jdbcType=INTEGER}, max_percent_per_order = #{record.maxPercentPerOrder,jdbcType=INTEGER}, @@ -182,8 +182,8 @@ - - update ums_intergration_consume_setting + + update ums_integration_consume_setting deduction_per_amount = #{deductionPerAmount,jdbcType=INTEGER}, @@ -200,8 +200,8 @@ where id = #{id,jdbcType=BIGINT} - - update ums_intergration_consume_setting + + update ums_integration_consume_setting set deduction_per_amount = #{deductionPerAmount,jdbcType=INTEGER}, max_percent_per_order = #{maxPercentPerOrder,jdbcType=INTEGER}, use_unit = #{useUnit,jdbcType=INTEGER}, diff --git a/mall-portal/src/main/java/com/macro/mall/portal/controller/OmsPortalOrderController.java b/mall-portal/src/main/java/com/macro/mall/portal/controller/OmsPortalOrderController.java new file mode 100644 index 0000000..509363d --- /dev/null +++ b/mall-portal/src/main/java/com/macro/mall/portal/controller/OmsPortalOrderController.java @@ -0,0 +1,31 @@ +package com.macro.mall.portal.controller; + +import com.macro.mall.portal.domain.CommonResult; +import com.macro.mall.portal.domain.ConfirmOrderResult; +import com.macro.mall.portal.service.OmsPortalOrderService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.ResponseBody; + +/** + * 订单管理Controller + * Created by macro on 2018/8/30. + */ +@Controller +@Api(tags = "OmsPortalOrderController",description = "订单管理") +@RequestMapping("/order") +public class OmsPortalOrderController { + @Autowired + private OmsPortalOrderService portalOrderService; + @ApiOperation("根据购物车信息生成确认单信息") + @RequestMapping(value = "confirmOrder",method = RequestMethod.POST) + @ResponseBody + public Object confirmOrder(){ + ConfirmOrderResult confirmOrderResult = portalOrderService.generateConfirmOrder(); + return new CommonResult().success(confirmOrderResult); + } +} diff --git a/mall-portal/src/main/java/com/macro/mall/portal/domain/ConfirmOrderResult.java b/mall-portal/src/main/java/com/macro/mall/portal/domain/ConfirmOrderResult.java new file mode 100644 index 0000000..750b337 --- /dev/null +++ b/mall-portal/src/main/java/com/macro/mall/portal/domain/ConfirmOrderResult.java @@ -0,0 +1,117 @@ +package com.macro.mall.portal.domain; + +import com.macro.mall.model.UmsIntegrationConsumeSetting; +import com.macro.mall.model.UmsMemberReceiveAddress; + +import java.math.BigDecimal; +import java.util.List; + +/** + * 确认单信息封装 + * Created by macro on 2018/8/30. + */ +public class ConfirmOrderResult { + //包含优惠信息的购物车信息 + private List cartPromotionItemList; + //用户收货地址列表 + private List memberReceiveAddressList; + //用户可用优惠券列表 + private List couponHistoryDetailList; + //积分使用规则 + private UmsIntegrationConsumeSetting integrationConsumeSetting; + //会员持有的积分 + private Integer memberIntegration; + //计算的金额 + private CalcAmount calcAmount; + + public List getCartPromotionItemList() { + return cartPromotionItemList; + } + + public void setCartPromotionItemList(List cartPromotionItemList) { + this.cartPromotionItemList = cartPromotionItemList; + } + + public List getMemberReceiveAddressList() { + return memberReceiveAddressList; + } + + public void setMemberReceiveAddressList(List memberReceiveAddressList) { + this.memberReceiveAddressList = memberReceiveAddressList; + } + + public List getCouponHistoryDetailList() { + return couponHistoryDetailList; + } + + public void setCouponHistoryDetailList(List couponHistoryDetailList) { + this.couponHistoryDetailList = couponHistoryDetailList; + } + + public UmsIntegrationConsumeSetting getIntegrationConsumeSetting() { + return integrationConsumeSetting; + } + + public void setIntegrationConsumeSetting(UmsIntegrationConsumeSetting integrationConsumeSetting) { + this.integrationConsumeSetting = integrationConsumeSetting; + } + + public Integer getMemberIntegration() { + return memberIntegration; + } + + public void setMemberIntegration(Integer memberIntegration) { + this.memberIntegration = memberIntegration; + } + + public CalcAmount getCalcAmount() { + return calcAmount; + } + + public void setCalcAmount(CalcAmount calcAmount) { + this.calcAmount = calcAmount; + } + + public static class CalcAmount{ + //订单商品总金额 + private BigDecimal totalAmount; + //运费 + private BigDecimal freightAmount; + //活动优惠 + private BigDecimal promotionAmount; + //应付金额 + private BigDecimal payAmount; + + public BigDecimal getTotalAmount() { + return totalAmount; + } + + public void setTotalAmount(BigDecimal totalAmount) { + this.totalAmount = totalAmount; + } + + public BigDecimal getFreightAmount() { + return freightAmount; + } + + public void setFreightAmount(BigDecimal freightAmount) { + this.freightAmount = freightAmount; + } + + public BigDecimal getPromotionAmount() { + return promotionAmount; + } + + public void setPromotionAmount(BigDecimal promotionAmount) { + this.promotionAmount = promotionAmount; + } + + public BigDecimal getPayAmount() { + return payAmount; + } + + public void setPayAmount(BigDecimal payAmount) { + this.payAmount = payAmount; + } + } +} diff --git a/mall-portal/src/main/java/com/macro/mall/portal/service/OmsPortalOrderService.java b/mall-portal/src/main/java/com/macro/mall/portal/service/OmsPortalOrderService.java new file mode 100644 index 0000000..4ff0a2d --- /dev/null +++ b/mall-portal/src/main/java/com/macro/mall/portal/service/OmsPortalOrderService.java @@ -0,0 +1,14 @@ +package com.macro.mall.portal.service; + +import com.macro.mall.portal.domain.ConfirmOrderResult; + +/** + * 前台订单管理Service + * Created by macro on 2018/8/30. + */ +public interface OmsPortalOrderService { + /** + * 根据用户购物车信息生成确认单信息 + */ + ConfirmOrderResult generateConfirmOrder(); +} diff --git a/mall-portal/src/main/java/com/macro/mall/portal/service/impl/OmsPortalOrderServiceImpl.java b/mall-portal/src/main/java/com/macro/mall/portal/service/impl/OmsPortalOrderServiceImpl.java new file mode 100644 index 0000000..57adade --- /dev/null +++ b/mall-portal/src/main/java/com/macro/mall/portal/service/impl/OmsPortalOrderServiceImpl.java @@ -0,0 +1,75 @@ +package com.macro.mall.portal.service.impl; + +import com.macro.mall.mapper.UmsIntegrationConsumeSettingMapper; +import com.macro.mall.model.UmsIntegrationConsumeSetting; +import com.macro.mall.model.UmsMember; +import com.macro.mall.model.UmsMemberReceiveAddress; +import com.macro.mall.portal.domain.CartPromotionItem; +import com.macro.mall.portal.domain.ConfirmOrderResult; +import com.macro.mall.portal.domain.SmsCouponHistoryDetail; +import com.macro.mall.portal.service.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.math.BigDecimal; +import java.util.List; + +/** + * 前台订单管理Service + * Created by macro on 2018/8/30. + */ +@Service +public class OmsPortalOrderServiceImpl implements OmsPortalOrderService { + @Autowired + private UmsMemberService memberService; + @Autowired + private OmsCartItemService cartItemService; + @Autowired + private UmsMemberReceiveAddressService memberReceiveAddressService; + @Autowired + private UmsMemberCouponService memberCouponService; + @Autowired + private UmsIntegrationConsumeSettingMapper integrationConsumeSettingMapper; + @Override + public ConfirmOrderResult generateConfirmOrder() { + ConfirmOrderResult result = new ConfirmOrderResult(); + //获取购物车信息 + UmsMember currentMember = memberService.getCurrentMember(); + List cartPromotionItemList = cartItemService.listPromotion(currentMember.getId()); + result.setCartPromotionItemList(cartPromotionItemList); + //获取用户收货地址列表 + List memberReceiveAddressList = memberReceiveAddressService.list(); + result.setMemberReceiveAddressList(memberReceiveAddressList); + //获取用户可用优惠券列表 + List couponHistoryDetailList = memberCouponService.listCart(cartPromotionItemList, 1); + result.setCouponHistoryDetailList(couponHistoryDetailList); + //获取用户积分 + result.setMemberIntegration(currentMember.getIntegration()); + //获取积分使用规则 + UmsIntegrationConsumeSetting integrationConsumeSetting = integrationConsumeSettingMapper.selectByPrimaryKey(1L); + result.setIntegrationConsumeSetting(integrationConsumeSetting); + //计算总金额、活动优惠、应付金额 + ConfirmOrderResult.CalcAmount calcAmount = calcCartAmount(cartPromotionItemList); + result.setCalcAmount(calcAmount); + return result; + } + + /** + * 计算购物车中商品的价格 + */ + private ConfirmOrderResult.CalcAmount calcCartAmount(List cartPromotionItemList) { + ConfirmOrderResult.CalcAmount calcAmount = new ConfirmOrderResult.CalcAmount(); + calcAmount.setFreightAmount(new BigDecimal(0)); + BigDecimal totalAmount = new BigDecimal("0"); + BigDecimal promotionAmount = new BigDecimal("0"); + for (CartPromotionItem cartPromotionItem : cartPromotionItemList) { + totalAmount=totalAmount.add(cartPromotionItem.getPrice().multiply(new BigDecimal(cartPromotionItem.getQuantity()))); + promotionAmount=promotionAmount.add(cartPromotionItem.getReduceAmount().multiply(new BigDecimal(cartPromotionItem.getQuantity()))); + } + calcAmount.setTotalAmount(totalAmount); + calcAmount.setPromotionAmount(promotionAmount); + calcAmount.setPayAmount(totalAmount.subtract(promotionAmount)); + return calcAmount; + } + +} diff --git a/mall-portal/src/main/java/com/macro/mall/portal/service/impl/OmsPromotionServiceImpl.java b/mall-portal/src/main/java/com/macro/mall/portal/service/impl/OmsPromotionServiceImpl.java index c1b9331..afabf1b 100644 --- a/mall-portal/src/main/java/com/macro/mall/portal/service/impl/OmsPromotionServiceImpl.java +++ b/mall-portal/src/main/java/com/macro/mall/portal/service/impl/OmsPromotionServiceImpl.java @@ -45,7 +45,8 @@ public class OmsPromotionServiceImpl implements OmsPromotionService { BeanUtils.copyProperties(item,cartPromotionItem); cartPromotionItem.setPromotionMessage("单品促销"); //商品原价-促销价 - cartPromotionItem.setReduceAmount(getOriginalPrice(promotionProduct, item.getProductSkuId()).subtract(getSinglePromotionPrice(promotionProduct, item.getProductSkuId()))); + BigDecimal originalPrice = getOriginalPrice(promotionProduct, item.getProductSkuId()); + cartPromotionItem.setReduceAmount(originalPrice.subtract(getSinglePromotionPrice(promotionProduct, item.getProductSkuId()))); cartPromotionItemList.add(cartPromotionItem); } } else if (promotionType == 3) {