diff --git a/README.md b/README.md index c970782..27970ff 100644 --- a/README.md +++ b/README.md @@ -53,12 +53,12 @@ JTA事务处理 | ✔ OSS上传功能 | ✔ Elasticsearch搜索功能 | ✔ HTTPS支持 | ✔ -ELK日志收集功能 | -Redis数字型ID生成 | +Redis数字型ID生成 | ✔ SpringTask定时任务支持 | ✔ RestTemplate服务间调用 | docker容器化部署 | ✔ 配置区分生产和测试环境 | ✔ +ELK日志收集功能 | SpringSecurity权限管理功能 | ### 使用工具 @@ -273,9 +273,9 @@ Linux远程连接工具 | http://www.netsarang.com/download/software.html - 根据用户搜索记录聚合生成热搜词 -#### 购物流程 +#### 购物流程 ✔ -> **购物车** ✔ +> **购物车** - 添加商品到购物车 - 购物车商品列表（商品主图、商品名称、商品数量、商品规格） @@ -283,7 +283,7 @@ Linux远程连接工具 | http://www.netsarang.com/download/software.html - 购物车中商品重选规格 - 购物车中商品删除功能 -> **生成确认单** ✔ +> **生成确认单** - 生成确认单信息：收货信息、商品信息、价格信息、发票信息、支付方式 - 选择收货地址：默认收货地址 @@ -292,7 +292,7 @@ Linux远程连接工具 | http://www.netsarang.com/download/software.html - 选择支付方式：在线支付及货到付款 - 计算应付金额：合计+运费-优惠券抵扣-积分抵扣-活动优惠 -> **提交订单** ✔ +> **提交订单** - 将确认单信息转化为订单 - 删除购物车中相关商品 @@ -306,7 +306,6 @@ Linux远程连接工具 | http://www.netsarang.com/download/software.html > **取消订单（未支付情况下）** - 订单超时后自动取消订单，解除商品库存锁定，返还优惠券，积分 -- 用户自己取消订单，解除商品库存锁定，返还优惠券，积分 #### 会员模块（我的）✔ diff --git a/document/pdm/mall.pdb b/document/pdm/mall.pdb index 72c0ca0..b3ababf 100644 --- a/document/pdm/mall.pdb +++ b/document/pdm/mall.pdb @@ -1,5 +1,5 @@ - + @@ -14539,7 +14539,7 @@ LABL 0 新宋体,8,N oms_order_item 1522660695 zhenghong -1535938269 +1535964259 zhenghong 订单中所包含的商品 @@ -14789,9 +14789,35 @@ LABL 0 新宋体,8,N 10 2 + +3FBC2AE3-3000-41C7-B78C-DB7AC7ABDC16 +gift_integration +gift_integration +1535964164 +zhenghong +1535964238 +zhenghong +商品赠送积分 +0 +int +1 + + +C7705A4E-64E8-44A3-B3BE-7A8762E73CFD +gift_growth +gift_growth +1535964164 +zhenghong +1535964251 +zhenghong +商品赠送成长值 +0 +int +1 + - + 8B728C73-2ED3-4C44-8C64-95692A16EA10 Key_1 Key_1 @@ -14805,7 +14831,7 @@ LABL 0 新宋体,8,N - + @@ -14819,7 +14845,7 @@ LABL 0 新宋体,8,N 订单操作历史记录 - + 46247D13-9B17-44EB-9300-7BA49AC214FB id id @@ -14831,7 +14857,7 @@ LABL 0 新宋体,8,N 1 1 - + CBAA2797-F782-492E-89D8-B87830B4FD86 order_id order_id @@ -14842,7 +14868,7 @@ LABL 0 新宋体,8,N 订单id bigint - + B26D3031-3438-4CAB-BC93-2277F41D2F64 operate_man operate_man @@ -14854,7 +14880,7 @@ LABL 0 新宋体,8,N varchar(100) 100 - + 14B87125-FC24-4D09-982E-F43F618B6C3A create_time create_time @@ -14865,7 +14891,7 @@ LABL 0 新宋体,8,N 操作时间 datetime - + 296A8CF6-1BC8-46E1-846F-25114FF35EEB order_status order_status @@ -14877,7 +14903,7 @@ LABL 0 新宋体,8,N int(1) 1 - + 9F651D4E-088F-4735-ACAD-12ED16C49FDE note note @@ -14891,7 +14917,7 @@ LABL 0 新宋体,8,N - + 50772925-29B2-4E77-A02B-5AB8C229953C Key_1 Key_1 @@ -14900,12 +14926,12 @@ LABL 0 新宋体,8,N 1522725011 zhenghong - + - + @@ -14919,7 +14945,7 @@ LABL 0 新宋体,8,N 订单设置表 - + 03B16432-ECCE-4698-B24A-05554E64C35C id id @@ -14931,7 +14957,7 @@ LABL 0 新宋体,8,N 1 1 - + AC98E6B7-ADDF-43AD-B2F0-6CFE7715E9F1 flash_order_overtime flash_order_overtime @@ -14942,7 +14968,7 @@ LABL 0 新宋体,8,N 秒杀订单超时关闭时间(分) int - + C4E474C5-194A-4B54-8DF1-F37B681DE42B normal_order_overtime normal_order_overtime @@ -14953,7 +14979,7 @@ LABL 0 新宋体,8,N 正常订单超时时间(分) int - + 773FEFCD-F4A3-4D9E-B061-10C12CA1B397 confirm_overtime confirm_overtime @@ -14964,7 +14990,7 @@ LABL 0 新宋体,8,N 发货后自动确认收货时间（天） int - + DD5B89B8-5DC6-4EB1-B916-D76BD75CB0F5 finish_overtime finish_overtime @@ -14975,7 +15001,7 @@ LABL 0 新宋体,8,N 自动完成交易时间，不能申请售后（天） int - + D090D0ED-6A45-445C-ADE3-F1E18734F159 comment_overtime comment_overtime @@ -14988,7 +15014,7 @@ LABL 0 新宋体,8,N - + 7C2ADDA9-1584-4310-A3FE-7F1E18447823 Key_1 Key_1 @@ -14997,12 +15023,12 @@ LABL 0 新宋体,8,N 1522726101 zhenghong - + - + @@ -15016,7 +15042,7 @@ LABL 0 新宋体,8,N 订单退货申请 - + CF99B61C-D0E5-4EB4-BFC6-111A9F3D44E8 id id @@ -15028,7 +15054,7 @@ LABL 0 新宋体,8,N 1 1 - + A6E68B83-006A-468C-A461-C647705E038C order_id order_id @@ -15039,7 +15065,7 @@ LABL 0 新宋体,8,N 订单id bigint - + 8D1F23F9-09FD-416B-8E38-CFDE67721417 company_address_id company_address_id @@ -15049,7 +15075,7 @@ LABL 0 新宋体,8,N zhenghong bigint - + 56ACAE3C-5533-44A1-BA57-602058B6CEF2 order_sn order_sn @@ -15061,7 +15087,7 @@ LABL 0 新宋体,8,N varchar(64) 64 - + F2C78E24-CDB0-4AA7-B6CD-21E55B380E95 create_time create_time @@ -15071,7 +15097,7 @@ LABL 0 新宋体,8,N zhenghong datetime - + 70FBE2CF-BE0D-44DD-8679-39DAA782E1A3 member_username member_username @@ -15082,7 +15108,7 @@ LABL 0 新宋体,8,N varchar(64) 64 - + 7B8A70B3-9FC9-4136-BEC9-D2DF393DB988 return_amount return_amount @@ -15095,7 +15121,7 @@ LABL 0 新宋体,8,N 10 2 - + 4FB9898E-63E4-4B21-B577-504320D3D4F9 return_name return_name @@ -15106,7 +15132,7 @@ LABL 0 新宋体,8,N varchar(100) 100 - + 8ADCC57B-6CA5-4A89-8B5A-6283FE7B3DDF return_phone return_phone @@ -15118,7 +15144,7 @@ LABL 0 新宋体,8,N varchar(100) 100 - + F01CC8D2-508C-424D-BF17-AE42ABE28223 status status @@ -15130,7 +15156,7 @@ LABL 0 新宋体,8,N int(1) 1 - + 65402A2F-A01C-4B4D-9F19-9ACD48637159 handle_time handle_time @@ -15141,7 +15167,7 @@ LABL 0 新宋体,8,N 处理时间 datetime - + AADBD0C8-E8CD-45D6-BDF4-13840EEFA26C product_pic product_pic @@ -15152,7 +15178,7 @@ LABL 0 新宋体,8,N varchar(500) 500 - + B4BB6015-3948-411C-9558-6CAF55CEF04C product_name product_name @@ -15163,7 +15189,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + D30E609F-3F5C-401C-8690-EEA47B0E6694 brand_name brand_name @@ -15174,7 +15200,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + 86B4B2F7-9A36-47AC-A3DA-7F45FFF21639 product_attr product_attr @@ -15186,7 +15212,7 @@ LABL 0 新宋体,8,N varchar(500) 500 - + DE661909-8CDC-4C09-A0C1-5587F969523A product_count product_count @@ -15197,7 +15223,7 @@ LABL 0 新宋体,8,N 退货数量 int - + B4DB3A15-7B0F-4C6D-B961-AF2C4CF14D50 reason reason @@ -15209,7 +15235,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + ECE8A578-4D6B-47EB-BB72-207D9BC93324 description description @@ -15221,7 +15247,7 @@ LABL 0 新宋体,8,N varchar(500) 500 - + E3C2C9CF-D72D-44AA-B1A3-5B5AC1950B63 proof_pics proof_pics @@ -15233,7 +15259,7 @@ LABL 0 新宋体,8,N varchar(1000) 1000 - + 4647C7DC-D2B4-48B7-B5F3-4524FBAAD875 return_post_amount return_post_amount @@ -15246,7 +15272,7 @@ LABL 0 新宋体,8,N 10 2 - + 8361AE87-5DC4-470B-B12E-4A2EF7708701 return_post_status return_post_status @@ -15258,7 +15284,7 @@ LABL 0 新宋体,8,N int(1) 1 - + 3870169D-4A55-444E-9574-19FB829E9CB8 confirm_return_amount confirm_return_amount @@ -15271,7 +15297,7 @@ LABL 0 新宋体,8,N 10 2 - + B16F27C1-DFFA-40F1-83B5-F9DA3BB86FE6 handle_note handle_note @@ -15283,7 +15309,7 @@ LABL 0 新宋体,8,N varchar(500) 500 - + B8982C29-EB0D-4F63-A047-DDEDC91A78C3 handle_man handle_man @@ -15295,7 +15321,7 @@ LABL 0 新宋体,8,N varchar(100) 100 - + 49E217E2-31BF-4F23-8125-62D5920E0B60 receive_man receive_man @@ -15307,7 +15333,7 @@ LABL 0 新宋体,8,N varchar(100) 100 - + 8111E4F5-B8EA-4DCB-B899-A2E4921E6BC2 receive_time receive_time @@ -15317,7 +15343,7 @@ LABL 0 新宋体,8,N zhenghong datetime - + 4C802C73-FB19-4C09-84C3-37E152CA8299 receive_note receive_note @@ -15330,7 +15356,7 @@ LABL 0 新宋体,8,N - + D06B934B-B63D-4DCC-B1C1-62F79744A8AC Key_1 Key_1 @@ -15339,12 +15365,12 @@ LABL 0 新宋体,8,N 1522732939 zhenghong - + - + @@ -15358,7 +15384,7 @@ LABL 0 新宋体,8,N 公司收发货地址表 - + F5A62BE4-F0B9-46C3-8591-5864BB83220D id id @@ -15370,7 +15396,7 @@ LABL 0 新宋体,8,N 1 1 - + 359C7F83-8810-4F75-935C-8099B75676C6 address_name address_name @@ -15382,7 +15408,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + 5AA8AC8B-9617-4A6F-B898-4206F7CE8169 send_status send_status @@ -15394,7 +15420,7 @@ LABL 0 新宋体,8,N int(1) 1 - + CDF1655B-32CC-4E54-BBE7-5F00549B7722 receive_status receive_status @@ -15406,7 +15432,7 @@ LABL 0 新宋体,8,N int(1) 1 - + F5195500-8663-482B-B587-27789546188C name name @@ -15418,7 +15444,7 @@ LABL 0 新宋体,8,N varchar(64) 64 - + D51012F2-BECB-4E6B-A7E9-5B6AC06D9087 phone phone @@ -15430,7 +15456,7 @@ LABL 0 新宋体,8,N varchar(64) 64 - + 3D2DC8D4-9D56-4E95-8266-052132761CDE province province @@ -15441,7 +15467,7 @@ LABL 0 新宋体,8,N varchar(64) 64 - + 57267BF2-434D-4AEC-8E6B-DDCAA85233F7 city city @@ -15452,7 +15478,7 @@ LABL 0 新宋体,8,N varchar(64) 64 - + F1F15023-139B-4048-8D0C-C9C46884C6E9 region region @@ -15465,7 +15491,7 @@ LABL 0 新宋体,8,N - + 9B8E57D5-D022-48D7-BA87-3214D2DAB1BD Key_1 Key_1 @@ -15474,12 +15500,12 @@ LABL 0 新宋体,8,N 1522745192 zhenghong - + - + @@ -15493,7 +15519,7 @@ LABL 0 新宋体,8,N 退货原因表 - + 8398CF1C-2327-4762-B370-7F7BB681FBE8 id id @@ -15505,7 +15531,7 @@ LABL 0 新宋体,8,N 1 1 - + 7C7CCC5E-FBE6-49A6-A428-95A8A078B4EA name name @@ -15517,7 +15543,7 @@ LABL 0 新宋体,8,N varchar(100) 100 - + 0C284FC4-E892-4BFF-B0AC-AD9BCB8E39D2 sort sort @@ -15527,7 +15553,7 @@ LABL 0 新宋体,8,N zhenghong int - + D0151FA2-84E3-4252-9565-766B748B7AD3 status status @@ -15541,7 +15567,7 @@ LABL 0 新宋体,8,N - + F0009D1F-CC14-45AA-BDB7-F25CFBBFE380 Key_1 Key_1 @@ -15550,12 +15576,12 @@ LABL 0 新宋体,8,N 1533115911 zhenghong - + - + @@ -15569,7 +15595,7 @@ LABL 0 新宋体,8,N 购物车表 - + 0496CCD8-F7CC-4DD4-AEE7-919D8EFCD676 id id @@ -15581,7 +15607,7 @@ LABL 0 新宋体,8,N 1 1 - + BC6AB2CA-354D-447A-A466-54980B87F57F product_id product_id @@ -15591,7 +15617,7 @@ LABL 0 新宋体,8,N zhenghong bigint - + 48241AB2-A6B4-48E5-A792-FAB72D97FD42 product_sku_id product_sku_id @@ -15601,7 +15627,7 @@ LABL 0 新宋体,8,N zhenghong bigint - + 70CEB9F6-7F7D-4AB1-BB9D-3667BA109C72 member_id member_id @@ -15611,7 +15637,7 @@ LABL 0 新宋体,8,N zhenghong bigint - + 8B8B68C0-7987-4E2B-9BAD-FF4F3428E03A quantity quantity @@ -15622,7 +15648,7 @@ LABL 0 新宋体,8,N 购买数量 int - + E2A71768-48C5-46B2-82B8-635169BFE66D price price @@ -15635,7 +15661,7 @@ LABL 0 新宋体,8,N 10 2 - + 1EB6341A-F163-4763-8A41-99BB5914189A sp1 sp1 @@ -15647,7 +15673,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + 10C79639-93BE-48F3-B2A4-98AC7C338882 sp2 sp2 @@ -15659,7 +15685,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + 629EE7D7-D006-4AB6-8EF9-0B30E4283004 sp3 sp3 @@ -15671,7 +15697,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + B5A53CF7-C87D-411B-89DF-41888E2722C7 product_pic product_pic @@ -15683,7 +15709,7 @@ LABL 0 新宋体,8,N varchar(1000) 1000 - + E1A4F06D-34AE-4B0C-BCC6-F82BA9D1A76F product_name product_name @@ -15695,7 +15721,7 @@ LABL 0 新宋体,8,N varchar(500) 500 - + 7BBD4FA7-9C75-4ECA-9E08-BBEAC572BCB1 product_brand product_brand @@ -15706,7 +15732,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + 11170A56-1C61-4372-9E46-A3C9C587340E product_sn product_sn @@ -15717,7 +15743,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + 2D4BFCEF-83F1-4697-8EF7-DCC5D2A9491D product_sub_title product_sub_title @@ -15729,7 +15755,7 @@ LABL 0 新宋体,8,N varchar(500) 500 - + 8A7E5878-BB5E-49F3-BE20-E6986E172BB3 product_sku_code product_sku_code @@ -15741,7 +15767,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + 23C68713-D38A-4915-96E3-A9762199D386 member_nickname member_nickname @@ -15753,7 +15779,7 @@ LABL 0 新宋体,8,N varchar(500) 500 - + 5675315C-7265-4AC3-88D4-BC1525AC73B7 create_date create_date @@ -15764,7 +15790,7 @@ LABL 0 新宋体,8,N 创建时间 datetime - + 1D877A06-39CD-4A3C-B4A8-059588D13838 modify_date modify_date @@ -15775,7 +15801,7 @@ LABL 0 新宋体,8,N 修改时间 datetime - + 20EF4C13-435F-4C03-B8A9-7E31F1432E21 delete_status delete_status @@ -15788,7 +15814,7 @@ LABL 0 新宋体,8,N int(1) 1 - + 9C9C2AC9-F58B-4D31-BEF4-1D1892931E51 product_category_id product_category_id @@ -15801,7 +15827,7 @@ LABL 0 新宋体,8,N - + 29D735B7-E618-4C13-AF03-3858C68E6BA4 Key_1 Key_1 @@ -15810,12 +15836,12 @@ LABL 0 新宋体,8,N 1533108680 zhenghong - + - + @@ -15841,7 +15867,7 @@ LABL 0 新宋体,8,N - + 5236F74C-2761-4AC4-834A-BECC5D040393 1521706257 zhenghong @@ -15877,7 +15903,7 @@ LABL 0 新宋体,8,N - + 6EE78803-E5F6-4090-B810-7BBF7814F60C 1521710488 zhenghong @@ -15913,7 +15939,7 @@ LABL 0 新宋体,8,N - + 84F722B4-DF57-4BC3-88FD-B249B70D21A7 1521770349 zhenghong @@ -15949,7 +15975,7 @@ LABL 0 新宋体,8,N - + 0309D83E-51C3-4973-A636-9FEB27F4A6B6 1521771362 zhenghong @@ -15985,7 +16011,7 @@ LABL 0 新宋体,8,N - + 7B820697-9FFD-4446-B6DF-F03F4F02FFE3 1521773101 zhenghong @@ -16021,7 +16047,7 @@ LABL 0 新宋体,8,N - + 13DDC5F6-372D-47FF-AAFA-8AEF349E7FA8 1521783613 zhenghong @@ -16057,7 +16083,7 @@ LABL 0 新宋体,8,N - + 31ADEBC6-F176-41A7-8EAA-9AC3B8A253AB 1521791466 zhenghong @@ -16093,7 +16119,7 @@ LABL 0 新宋体,8,N - + F2B169B3-7AC8-4FB1-822D-E1C91DFF6FFD 1521792428 zhenghong @@ -16129,7 +16155,7 @@ LABL 0 新宋体,8,N - + 00AD7B43-F4CA-45D7-86BB-5756B4ED55BD 1521792909 zhenghong @@ -16165,7 +16191,7 @@ LABL 0 新宋体,8,N - + 286E06C6-6FAD-4323-82D9-6FB781153C46 1522045168 zhenghong @@ -16201,7 +16227,7 @@ LABL 0 新宋体,8,N - + A2161167-D453-4661-9BF0-71D8908A6C42 1522046100 zhenghong @@ -16237,7 +16263,7 @@ LABL 0 新宋体,8,N - + E25FF0B6-41E2-4801-8FE9-337EF9B991F7 1522046451 zhenghong @@ -16273,7 +16299,7 @@ LABL 0 新宋体,8,N - + 1E64FE44-48BA-49B0-BDE1-66DA22B89EFF 1522046456 zhenghong @@ -16309,7 +16335,7 @@ LABL 0 新宋体,8,N - + DEE74089-6A6D-4D7E-BADD-76E4D08EFA2D 1522112691 zhenghong @@ -16345,7 +16371,7 @@ LABL 0 新宋体,8,N - + 5D44A212-AD69-4958-BAAF-9E16ED63FC67 1522112694 zhenghong @@ -16381,7 +16407,7 @@ LABL 0 新宋体,8,N - + ECA8F78C-7015-44EB-9CD2-F72634D7F4BD 1522114406 zhenghong @@ -16417,7 +16443,7 @@ LABL 0 新宋体,8,N - + 32BD37D4-4436-4069-9BD1-90CF0B1867E0 1522115961 zhenghong @@ -16453,7 +16479,7 @@ LABL 0 新宋体,8,N - + 1A23B754-71EE-4496-B70F-0A3268C6F651 1522115983 zhenghong @@ -16489,7 +16515,7 @@ LABL 0 新宋体,8,N - + 1C883E67-84F9-4CD0-A4F5-D7CA2BE15DC5 1522118676 zhenghong @@ -16525,7 +16551,7 @@ LABL 0 新宋体,8,N - + 1CE2FCCB-DF37-4C88-99DD-FA8C3EE7A09C 1522119056 zhenghong @@ -16561,7 +16587,7 @@ LABL 0 新宋体,8,N - + 7D8DC4F2-D0A4-4CE9-B03E-44AE166786C0 1522120295 zhenghong @@ -16597,7 +16623,7 @@ LABL 0 新宋体,8,N - + 7CB99F50-753B-4347-B896-1F18D8FE6691 1522138613 zhenghong @@ -16633,7 +16659,7 @@ LABL 0 新宋体,8,N - + EC89DA87-A575-4940-973B-665854268261 1522138618 zhenghong @@ -16669,7 +16695,7 @@ LABL 0 新宋体,8,N - + 8E1A22EC-2246-48C4-A499-3D8A4D264C09 1522138705 zhenghong @@ -16705,7 +16731,7 @@ LABL 0 新宋体,8,N - + 2EA7348D-C8E8-4FCC-8215-01FE3AD58DFB 1522141157 zhenghong @@ -16741,7 +16767,7 @@ LABL 0 新宋体,8,N - + 8B858AAC-D00A-42FE-BEDC-73536876C045 1522141232 zhenghong @@ -16777,7 +16803,7 @@ LABL 0 新宋体,8,N - + FC3A22FE-FD24-4DF0-BAC8-22659D3C8987 1522141317 zhenghong @@ -16813,7 +16839,7 @@ LABL 0 新宋体,8,N - + 14DB9C0C-F9F0-4D4A-B44E-592028F6E75A 1522142006 zhenghong @@ -16849,7 +16875,7 @@ LABL 0 新宋体,8,N - + 15304E84-71AA-40B1-84CB-904384B34B25 1522215975 zhenghong @@ -16885,7 +16911,7 @@ LABL 0 新宋体,8,N - + 457237AD-87EB-4A09-BA9F-36198B10D2FF 1522216015 zhenghong @@ -16921,7 +16947,7 @@ LABL 0 新宋体,8,N - + 3C2E5F27-A07C-4D88-9357-089D36122A25 1522216251 zhenghong @@ -16957,7 +16983,7 @@ LABL 0 新宋体,8,N - + A8FA4798-0F1E-4D96-A254-77F5D71F6BBD 1522216380 zhenghong @@ -16993,7 +17019,7 @@ LABL 0 新宋体,8,N - + 5026171A-4B51-4B83-A113-4051F1E4F415 1522220508 zhenghong @@ -17029,7 +17055,7 @@ LABL 0 新宋体,8,N - + 462222B9-A203-4D60-A353-A168356E3140 1522220546 zhenghong @@ -17065,7 +17091,7 @@ LABL 0 新宋体,8,N - + BD28F911-4F98-4C9D-9171-E99F60476E2A 1522224364 zhenghong @@ -17101,7 +17127,7 @@ LABL 0 新宋体,8,N - + 8D1675C9-7749-4831-A5E6-ACD971AACF57 1522225874 zhenghong @@ -17137,7 +17163,7 @@ LABL 0 新宋体,8,N - + B30347B3-4138-4EA8-A0F5-EF0D9A34E01F 1522226077 zhenghong @@ -17173,7 +17199,7 @@ LABL 0 新宋体,8,N - + 7D29D8DF-7EF1-4F43-928F-DDAC96A23858 1522226272 zhenghong @@ -17209,7 +17235,7 @@ LABL 0 新宋体,8,N - + EB0A7FB4-285A-4D5D-BC1D-E9B299069C1F 1522301998 zhenghong @@ -17245,7 +17271,7 @@ LABL 0 新宋体,8,N - + 942BBD31-85B8-46EA-893C-CB327C86F5BA 1522303390 zhenghong @@ -17281,7 +17307,7 @@ LABL 0 新宋体,8,N - + 1E5174EE-C0B0-4144-98D5-679634DCCAEE 1522303410 zhenghong @@ -17317,7 +17343,7 @@ LABL 0 新宋体,8,N - + BD55704C-3F36-44CC-90E1-143F097FA894 1522304178 zhenghong @@ -17353,7 +17379,7 @@ LABL 0 新宋体,8,N - + 17EC5CAA-580C-493D-9C2D-2EA3E9732A78 1522386868 zhenghong @@ -17389,7 +17415,7 @@ LABL 0 新宋体,8,N - + F469B162-D88C-42A3-B64C-7B2751A4FCE1 1522387461 zhenghong @@ -17425,7 +17451,7 @@ LABL 0 新宋体,8,N - + 1D18BF30-4375-4618-A1C9-6DC998F248E4 1522387526 zhenghong @@ -17461,7 +17487,7 @@ LABL 0 新宋体,8,N - + 183F9969-663E-4842-ABC2-C938F02C05E4 1522389232 zhenghong @@ -17497,7 +17523,7 @@ LABL 0 新宋体,8,N - + AC355266-228D-4333-8E95-D13F2D176DB4 1522390434 zhenghong @@ -17533,7 +17559,7 @@ LABL 0 新宋体,8,N - + 3A358827-AE90-4AC6-80E6-CA340D69F7F2 1522390644 zhenghong @@ -17569,7 +17595,7 @@ LABL 0 新宋体,8,N - + B0F12E0B-F2E6-40A6-AD2B-9FE858AAA8BE 1522391366 zhenghong @@ -17605,7 +17631,7 @@ LABL 0 新宋体,8,N - + F46C48A9-78A1-4C9A-BD75-DE0ED230A76D 1522391379 zhenghong @@ -17641,7 +17667,7 @@ LABL 0 新宋体,8,N - + 711AD4D5-212E-4E3B-BB26-DB79C4BE4E52 1522396648 zhenghong @@ -17677,7 +17703,7 @@ LABL 0 新宋体,8,N - + 094B7BE5-D0AB-4987-8D74-508A27D3117F 1522396864 zhenghong @@ -17713,7 +17739,7 @@ LABL 0 新宋体,8,N - + 8C15D427-62A0-40E7-9B02-84063CC6EB94 1522659209 zhenghong @@ -17749,7 +17775,7 @@ LABL 0 新宋体,8,N - + 043B7E7F-6688-42FD-BECE-3A4CE5A560F2 1522660753 zhenghong @@ -17785,7 +17811,7 @@ LABL 0 新宋体,8,N - + 3592DAA0-2C95-48CF-9359-C157A0E27DC3 1522660820 zhenghong @@ -17821,7 +17847,7 @@ LABL 0 新宋体,8,N - + BEE8D279-8DBF-40B3-899D-5B07570D0AD9 1522721755 zhenghong @@ -17857,7 +17883,7 @@ LABL 0 新宋体,8,N - + F5D0566A-35C3-4451-9C7D-782BC776C53E 1522724329 zhenghong @@ -17893,7 +17919,7 @@ LABL 0 新宋体,8,N - + 3AA8813B-9363-406A-91DF-4AD16E9C3CCA 1522725331 zhenghong @@ -17903,7 +17929,7 @@ LABL 0 新宋体,8,N - + @@ -17929,7 +17955,7 @@ LABL 0 新宋体,8,N - + DD05624A-7E08-4273-9758-C5EDA1A03134 1522733188 zhenghong @@ -17939,7 +17965,7 @@ LABL 0 新宋体,8,N - + @@ -17962,20 +17988,20 @@ LABL 0 新宋体,8,N - + - + EBF8A4B9-24B3-4D18-82FD-D12F847328C6 1522745521 zhenghong 1522745521 zhenghong - + - + @@ -18001,7 +18027,7 @@ LABL 0 新宋体,8,N - + BA7665F0-D173-45C6-AFE8-3C93CF330D79 1533109970 zhenghong @@ -18011,7 +18037,7 @@ LABL 0 新宋体,8,N - + @@ -18037,7 +18063,7 @@ LABL 0 新宋体,8,N - + 521484A5-B9C4-477D-8D45-97F7B15D7854 1533115829 zhenghong @@ -18047,7 +18073,7 @@ LABL 0 新宋体,8,N - + @@ -18073,7 +18099,7 @@ LABL 0 新宋体,8,N - + FCADB7B3-0636-44C7-8AB4-067148971867 1533115896 zhenghong @@ -18083,14 +18109,14 @@ LABL 0 新宋体,8,N - + - + 48492A0F-63AD-4453-B46B-89915CC87545 PUBLIC PUBLIC @@ -18101,7 +18127,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 b3ababf..f68bdc0 100644 --- a/document/pdm/mall.pdm +++ b/document/pdm/mall.pdm @@ -1,5 +1,5 @@ - + @@ -14044,7 +14044,7 @@ LABL 0 新宋体,8,N oms_order 1522658325 zhenghong -1535612363 +1536136220 zhenghong 订单表 @@ -14514,9 +14514,20 @@ LABL 0 新宋体,8,N + +F556C92B-2EE8-48AB-B431-CABDBE189320 +use_integration +use_integration +1536136197 +zhenghong +1536136230 +zhenghong +下单时使用的积分 +int + - + F98BE405-9DED-4054-ABBF-40BD4672B58B Key_1 Key_1 @@ -14530,7 +14541,7 @@ LABL 0 新宋体,8,N - + @@ -14544,7 +14555,7 @@ LABL 0 新宋体,8,N 订单中所包含的商品 - + C2ABF8A4-2DE7-4C17-8053-440A60BD8EE7 id id @@ -14556,7 +14567,7 @@ LABL 0 新宋体,8,N 1 1 - + B1934126-97B4-461B-B2A8-D53CCF81245C order_id order_id @@ -14567,7 +14578,7 @@ LABL 0 新宋体,8,N 订单id bigint - + EA411763-23EA-4E27-97CD-1C0D5925157C order_sn order_sn @@ -14579,7 +14590,7 @@ LABL 0 新宋体,8,N varchar(64) 64 - + DCF7D58B-AD64-48B0-9A65-4FDAE9A32DFB product_id product_id @@ -14589,7 +14600,7 @@ LABL 0 新宋体,8,N zhenghong bigint - + 7BDD65C2-224E-413D-AD83-437754569B1C product_pic product_pic @@ -14600,7 +14611,7 @@ LABL 0 新宋体,8,N varchar(500) 500 - + DFFC50EA-1E9A-4867-9EE8-B1A1B84E51E7 product_name product_name @@ -14611,7 +14622,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + 68478EE9-703A-4DFD-A085-7B109BBF650D product_brand product_brand @@ -14622,7 +14633,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + 27623FBE-2491-4310-AA4E-D93F4AD59154 product_sn product_sn @@ -14633,7 +14644,7 @@ LABL 0 新宋体,8,N varchar(64) 64 - + A9EF8281-439D-4D05-BB45-E933E648D979 product_price product_price @@ -14646,7 +14657,7 @@ LABL 0 新宋体,8,N 10 2 - + 015E8942-52BF-4342-9C4C-1230A266C1C9 product_quantity product_quantity @@ -14657,7 +14668,7 @@ LABL 0 新宋体,8,N 购买数量 int - + EE8FDF66-7853-4BCE-98D9-40ADC13CC78F product_sku_id product_sku_id @@ -14668,7 +14679,7 @@ LABL 0 新宋体,8,N 商品sku编号 bigint - + B13B6661-62F2-461A-B375-7556D6DBE56D product_sku_code product_sku_code @@ -14680,7 +14691,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 6B11B4F4-2F88-4DA2-A6C6-B5563F8AB67F product_category_id product_category_id @@ -14691,7 +14702,7 @@ LABL 0 新宋体,8,N 商品分类id bigint - + 51302EF8-1CD4-43F5-9C02-7920ED857D35 sp1 sp1 @@ -14703,7 +14714,7 @@ LABL 0 新宋体,8,N varchar(100) 100 - + AA056090-3D72-4BAC-A931-CD49C31B9D7E sp2 sp2 @@ -14714,7 +14725,7 @@ LABL 0 新宋体,8,N varchar(100) 100 - + C0CCCE2C-B2C8-44A1-9F6B-771BFE62D760 sp3 sp3 @@ -14725,7 +14736,7 @@ LABL 0 新宋体,8,N varchar(100) 100 - + 00A626D1-90DA-4262-8FFB-874691D67C3E promotion_name promotion_name @@ -14737,7 +14748,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + FCD8E9C9-7C56-47F0-8FBB-5534EB9B8FDE promotion_amount promotion_amount @@ -14750,7 +14761,7 @@ LABL 0 新宋体,8,N 10 2 - + 073E4D15-F6EB-405D-9429-3A2FD362E949 coupon_amount coupon_amount @@ -14763,7 +14774,7 @@ LABL 0 新宋体,8,N 10 2 - + B4781397-191A-42B9-AAF7-D96E7BC3449D integration_amount integration_amount @@ -14776,7 +14787,7 @@ LABL 0 新宋体,8,N 10 2 - + AD7CAE73-04BF-4BB8-BEFA-E0A7B94BF373 real_amount real_amount @@ -14789,7 +14800,7 @@ LABL 0 新宋体,8,N 10 2 - + 3FBC2AE3-3000-41C7-B78C-DB7AC7ABDC16 gift_integration gift_integration @@ -14802,7 +14813,7 @@ LABL 0 新宋体,8,N int 1 - + C7705A4E-64E8-44A3-B3BE-7A8762E73CFD gift_growth gift_growth @@ -14817,7 +14828,7 @@ LABL 0 新宋体,8,N - + 8B728C73-2ED3-4C44-8C64-95692A16EA10 Key_1 Key_1 @@ -14826,12 +14837,12 @@ LABL 0 新宋体,8,N 1522660745 zhenghong - + - + @@ -14845,7 +14856,7 @@ LABL 0 新宋体,8,N 订单操作历史记录 - + 46247D13-9B17-44EB-9300-7BA49AC214FB id id @@ -14857,7 +14868,7 @@ LABL 0 新宋体,8,N 1 1 - + CBAA2797-F782-492E-89D8-B87830B4FD86 order_id order_id @@ -14868,7 +14879,7 @@ LABL 0 新宋体,8,N 订单id bigint - + B26D3031-3438-4CAB-BC93-2277F41D2F64 operate_man operate_man @@ -14880,7 +14891,7 @@ LABL 0 新宋体,8,N varchar(100) 100 - + 14B87125-FC24-4D09-982E-F43F618B6C3A create_time create_time @@ -14891,7 +14902,7 @@ LABL 0 新宋体,8,N 操作时间 datetime - + 296A8CF6-1BC8-46E1-846F-25114FF35EEB order_status order_status @@ -14903,7 +14914,7 @@ LABL 0 新宋体,8,N int(1) 1 - + 9F651D4E-088F-4735-ACAD-12ED16C49FDE note note @@ -14917,7 +14928,7 @@ LABL 0 新宋体,8,N - + 50772925-29B2-4E77-A02B-5AB8C229953C Key_1 Key_1 @@ -14926,12 +14937,12 @@ LABL 0 新宋体,8,N 1522725011 zhenghong - + - + @@ -14945,7 +14956,7 @@ LABL 0 新宋体,8,N 订单设置表 - + 03B16432-ECCE-4698-B24A-05554E64C35C id id @@ -14957,7 +14968,7 @@ LABL 0 新宋体,8,N 1 1 - + AC98E6B7-ADDF-43AD-B2F0-6CFE7715E9F1 flash_order_overtime flash_order_overtime @@ -14968,7 +14979,7 @@ LABL 0 新宋体,8,N 秒杀订单超时关闭时间(分) int - + C4E474C5-194A-4B54-8DF1-F37B681DE42B normal_order_overtime normal_order_overtime @@ -14979,7 +14990,7 @@ LABL 0 新宋体,8,N 正常订单超时时间(分) int - + 773FEFCD-F4A3-4D9E-B061-10C12CA1B397 confirm_overtime confirm_overtime @@ -14990,7 +15001,7 @@ LABL 0 新宋体,8,N 发货后自动确认收货时间（天） int - + DD5B89B8-5DC6-4EB1-B916-D76BD75CB0F5 finish_overtime finish_overtime @@ -15001,7 +15012,7 @@ LABL 0 新宋体,8,N 自动完成交易时间，不能申请售后（天） int - + D090D0ED-6A45-445C-ADE3-F1E18734F159 comment_overtime comment_overtime @@ -15014,7 +15025,7 @@ LABL 0 新宋体,8,N - + 7C2ADDA9-1584-4310-A3FE-7F1E18447823 Key_1 Key_1 @@ -15023,12 +15034,12 @@ LABL 0 新宋体,8,N 1522726101 zhenghong - + - + @@ -15042,7 +15053,7 @@ LABL 0 新宋体,8,N 订单退货申请 - + CF99B61C-D0E5-4EB4-BFC6-111A9F3D44E8 id id @@ -15054,7 +15065,7 @@ LABL 0 新宋体,8,N 1 1 - + A6E68B83-006A-468C-A461-C647705E038C order_id order_id @@ -15065,7 +15076,7 @@ LABL 0 新宋体,8,N 订单id bigint - + 8D1F23F9-09FD-416B-8E38-CFDE67721417 company_address_id company_address_id @@ -15075,7 +15086,7 @@ LABL 0 新宋体,8,N zhenghong bigint - + 56ACAE3C-5533-44A1-BA57-602058B6CEF2 order_sn order_sn @@ -15087,7 +15098,7 @@ LABL 0 新宋体,8,N varchar(64) 64 - + F2C78E24-CDB0-4AA7-B6CD-21E55B380E95 create_time create_time @@ -15097,7 +15108,7 @@ LABL 0 新宋体,8,N zhenghong datetime - + 70FBE2CF-BE0D-44DD-8679-39DAA782E1A3 member_username member_username @@ -15108,7 +15119,7 @@ LABL 0 新宋体,8,N varchar(64) 64 - + 7B8A70B3-9FC9-4136-BEC9-D2DF393DB988 return_amount return_amount @@ -15121,7 +15132,7 @@ LABL 0 新宋体,8,N 10 2 - + 4FB9898E-63E4-4B21-B577-504320D3D4F9 return_name return_name @@ -15132,7 +15143,7 @@ LABL 0 新宋体,8,N varchar(100) 100 - + 8ADCC57B-6CA5-4A89-8B5A-6283FE7B3DDF return_phone return_phone @@ -15144,7 +15155,7 @@ LABL 0 新宋体,8,N varchar(100) 100 - + F01CC8D2-508C-424D-BF17-AE42ABE28223 status status @@ -15156,7 +15167,7 @@ LABL 0 新宋体,8,N int(1) 1 - + 65402A2F-A01C-4B4D-9F19-9ACD48637159 handle_time handle_time @@ -15167,7 +15178,7 @@ LABL 0 新宋体,8,N 处理时间 datetime - + AADBD0C8-E8CD-45D6-BDF4-13840EEFA26C product_pic product_pic @@ -15178,7 +15189,7 @@ LABL 0 新宋体,8,N varchar(500) 500 - + B4BB6015-3948-411C-9558-6CAF55CEF04C product_name product_name @@ -15189,7 +15200,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + D30E609F-3F5C-401C-8690-EEA47B0E6694 brand_name brand_name @@ -15200,7 +15211,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + 86B4B2F7-9A36-47AC-A3DA-7F45FFF21639 product_attr product_attr @@ -15212,7 +15223,7 @@ LABL 0 新宋体,8,N varchar(500) 500 - + DE661909-8CDC-4C09-A0C1-5587F969523A product_count product_count @@ -15223,7 +15234,7 @@ LABL 0 新宋体,8,N 退货数量 int - + B4DB3A15-7B0F-4C6D-B961-AF2C4CF14D50 reason reason @@ -15235,7 +15246,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + ECE8A578-4D6B-47EB-BB72-207D9BC93324 description description @@ -15247,7 +15258,7 @@ LABL 0 新宋体,8,N varchar(500) 500 - + E3C2C9CF-D72D-44AA-B1A3-5B5AC1950B63 proof_pics proof_pics @@ -15259,7 +15270,7 @@ LABL 0 新宋体,8,N varchar(1000) 1000 - + 4647C7DC-D2B4-48B7-B5F3-4524FBAAD875 return_post_amount return_post_amount @@ -15272,7 +15283,7 @@ LABL 0 新宋体,8,N 10 2 - + 8361AE87-5DC4-470B-B12E-4A2EF7708701 return_post_status return_post_status @@ -15284,7 +15295,7 @@ LABL 0 新宋体,8,N int(1) 1 - + 3870169D-4A55-444E-9574-19FB829E9CB8 confirm_return_amount confirm_return_amount @@ -15297,7 +15308,7 @@ LABL 0 新宋体,8,N 10 2 - + B16F27C1-DFFA-40F1-83B5-F9DA3BB86FE6 handle_note handle_note @@ -15309,7 +15320,7 @@ LABL 0 新宋体,8,N varchar(500) 500 - + B8982C29-EB0D-4F63-A047-DDEDC91A78C3 handle_man handle_man @@ -15321,7 +15332,7 @@ LABL 0 新宋体,8,N varchar(100) 100 - + 49E217E2-31BF-4F23-8125-62D5920E0B60 receive_man receive_man @@ -15333,7 +15344,7 @@ LABL 0 新宋体,8,N varchar(100) 100 - + 8111E4F5-B8EA-4DCB-B899-A2E4921E6BC2 receive_time receive_time @@ -15343,7 +15354,7 @@ LABL 0 新宋体,8,N zhenghong datetime - + 4C802C73-FB19-4C09-84C3-37E152CA8299 receive_note receive_note @@ -15356,7 +15367,7 @@ LABL 0 新宋体,8,N - + D06B934B-B63D-4DCC-B1C1-62F79744A8AC Key_1 Key_1 @@ -15365,12 +15376,12 @@ LABL 0 新宋体,8,N 1522732939 zhenghong - + - + @@ -15384,7 +15395,7 @@ LABL 0 新宋体,8,N 公司收发货地址表 - + F5A62BE4-F0B9-46C3-8591-5864BB83220D id id @@ -15396,7 +15407,7 @@ LABL 0 新宋体,8,N 1 1 - + 359C7F83-8810-4F75-935C-8099B75676C6 address_name address_name @@ -15408,7 +15419,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + 5AA8AC8B-9617-4A6F-B898-4206F7CE8169 send_status send_status @@ -15420,7 +15431,7 @@ LABL 0 新宋体,8,N int(1) 1 - + CDF1655B-32CC-4E54-BBE7-5F00549B7722 receive_status receive_status @@ -15432,7 +15443,7 @@ LABL 0 新宋体,8,N int(1) 1 - + F5195500-8663-482B-B587-27789546188C name name @@ -15444,7 +15455,7 @@ LABL 0 新宋体,8,N varchar(64) 64 - + D51012F2-BECB-4E6B-A7E9-5B6AC06D9087 phone phone @@ -15456,7 +15467,7 @@ LABL 0 新宋体,8,N varchar(64) 64 - + 3D2DC8D4-9D56-4E95-8266-052132761CDE province province @@ -15467,7 +15478,7 @@ LABL 0 新宋体,8,N varchar(64) 64 - + 57267BF2-434D-4AEC-8E6B-DDCAA85233F7 city city @@ -15478,7 +15489,7 @@ LABL 0 新宋体,8,N varchar(64) 64 - + F1F15023-139B-4048-8D0C-C9C46884C6E9 region region @@ -15491,7 +15502,7 @@ LABL 0 新宋体,8,N - + 9B8E57D5-D022-48D7-BA87-3214D2DAB1BD Key_1 Key_1 @@ -15500,12 +15511,12 @@ LABL 0 新宋体,8,N 1522745192 zhenghong - + - + @@ -15519,7 +15530,7 @@ LABL 0 新宋体,8,N 退货原因表 - + 8398CF1C-2327-4762-B370-7F7BB681FBE8 id id @@ -15531,7 +15542,7 @@ LABL 0 新宋体,8,N 1 1 - + 7C7CCC5E-FBE6-49A6-A428-95A8A078B4EA name name @@ -15543,7 +15554,7 @@ LABL 0 新宋体,8,N varchar(100) 100 - + 0C284FC4-E892-4BFF-B0AC-AD9BCB8E39D2 sort sort @@ -15553,7 +15564,7 @@ LABL 0 新宋体,8,N zhenghong int - + D0151FA2-84E3-4252-9565-766B748B7AD3 status status @@ -15567,7 +15578,7 @@ LABL 0 新宋体,8,N - + F0009D1F-CC14-45AA-BDB7-F25CFBBFE380 Key_1 Key_1 @@ -15576,12 +15587,12 @@ LABL 0 新宋体,8,N 1533115911 zhenghong - + - + @@ -15595,7 +15606,7 @@ LABL 0 新宋体,8,N 购物车表 - + 0496CCD8-F7CC-4DD4-AEE7-919D8EFCD676 id id @@ -15607,7 +15618,7 @@ LABL 0 新宋体,8,N 1 1 - + BC6AB2CA-354D-447A-A466-54980B87F57F product_id product_id @@ -15617,7 +15628,7 @@ LABL 0 新宋体,8,N zhenghong bigint - + 48241AB2-A6B4-48E5-A792-FAB72D97FD42 product_sku_id product_sku_id @@ -15627,7 +15638,7 @@ LABL 0 新宋体,8,N zhenghong bigint - + 70CEB9F6-7F7D-4AB1-BB9D-3667BA109C72 member_id member_id @@ -15637,7 +15648,7 @@ LABL 0 新宋体,8,N zhenghong bigint - + 8B8B68C0-7987-4E2B-9BAD-FF4F3428E03A quantity quantity @@ -15648,7 +15659,7 @@ LABL 0 新宋体,8,N 购买数量 int - + E2A71768-48C5-46B2-82B8-635169BFE66D price price @@ -15661,7 +15672,7 @@ LABL 0 新宋体,8,N 10 2 - + 1EB6341A-F163-4763-8A41-99BB5914189A sp1 sp1 @@ -15673,7 +15684,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + 10C79639-93BE-48F3-B2A4-98AC7C338882 sp2 sp2 @@ -15685,7 +15696,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + 629EE7D7-D006-4AB6-8EF9-0B30E4283004 sp3 sp3 @@ -15697,7 +15708,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + B5A53CF7-C87D-411B-89DF-41888E2722C7 product_pic product_pic @@ -15709,7 +15720,7 @@ LABL 0 新宋体,8,N varchar(1000) 1000 - + E1A4F06D-34AE-4B0C-BCC6-F82BA9D1A76F product_name product_name @@ -15721,7 +15732,7 @@ LABL 0 新宋体,8,N varchar(500) 500 - + 7BBD4FA7-9C75-4ECA-9E08-BBEAC572BCB1 product_brand product_brand @@ -15732,7 +15743,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + 11170A56-1C61-4372-9E46-A3C9C587340E product_sn product_sn @@ -15743,7 +15754,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + 2D4BFCEF-83F1-4697-8EF7-DCC5D2A9491D product_sub_title product_sub_title @@ -15755,7 +15766,7 @@ LABL 0 新宋体,8,N varchar(500) 500 - + 8A7E5878-BB5E-49F3-BE20-E6986E172BB3 product_sku_code product_sku_code @@ -15767,7 +15778,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + 23C68713-D38A-4915-96E3-A9762199D386 member_nickname member_nickname @@ -15779,7 +15790,7 @@ LABL 0 新宋体,8,N varchar(500) 500 - + 5675315C-7265-4AC3-88D4-BC1525AC73B7 create_date create_date @@ -15790,7 +15801,7 @@ LABL 0 新宋体,8,N 创建时间 datetime - + 1D877A06-39CD-4A3C-B4A8-059588D13838 modify_date modify_date @@ -15801,7 +15812,7 @@ LABL 0 新宋体,8,N 修改时间 datetime - + 20EF4C13-435F-4C03-B8A9-7E31F1432E21 delete_status delete_status @@ -15814,7 +15825,7 @@ LABL 0 新宋体,8,N int(1) 1 - + 9C9C2AC9-F58B-4D31-BEF4-1D1892931E51 product_category_id product_category_id @@ -15827,7 +15838,7 @@ LABL 0 新宋体,8,N - + 29D735B7-E618-4C13-AF03-3858C68E6BA4 Key_1 Key_1 @@ -15836,12 +15847,12 @@ LABL 0 新宋体,8,N 1533108680 zhenghong - + - + @@ -15867,7 +15878,7 @@ LABL 0 新宋体,8,N - + 5236F74C-2761-4AC4-834A-BECC5D040393 1521706257 zhenghong @@ -15903,7 +15914,7 @@ LABL 0 新宋体,8,N - + 6EE78803-E5F6-4090-B810-7BBF7814F60C 1521710488 zhenghong @@ -15939,7 +15950,7 @@ LABL 0 新宋体,8,N - + 84F722B4-DF57-4BC3-88FD-B249B70D21A7 1521770349 zhenghong @@ -15975,7 +15986,7 @@ LABL 0 新宋体,8,N - + 0309D83E-51C3-4973-A636-9FEB27F4A6B6 1521771362 zhenghong @@ -16011,7 +16022,7 @@ LABL 0 新宋体,8,N - + 7B820697-9FFD-4446-B6DF-F03F4F02FFE3 1521773101 zhenghong @@ -16047,7 +16058,7 @@ LABL 0 新宋体,8,N - + 13DDC5F6-372D-47FF-AAFA-8AEF349E7FA8 1521783613 zhenghong @@ -16083,7 +16094,7 @@ LABL 0 新宋体,8,N - + 31ADEBC6-F176-41A7-8EAA-9AC3B8A253AB 1521791466 zhenghong @@ -16119,7 +16130,7 @@ LABL 0 新宋体,8,N - + F2B169B3-7AC8-4FB1-822D-E1C91DFF6FFD 1521792428 zhenghong @@ -16155,7 +16166,7 @@ LABL 0 新宋体,8,N - + 00AD7B43-F4CA-45D7-86BB-5756B4ED55BD 1521792909 zhenghong @@ -16191,7 +16202,7 @@ LABL 0 新宋体,8,N - + 286E06C6-6FAD-4323-82D9-6FB781153C46 1522045168 zhenghong @@ -16227,7 +16238,7 @@ LABL 0 新宋体,8,N - + A2161167-D453-4661-9BF0-71D8908A6C42 1522046100 zhenghong @@ -16263,7 +16274,7 @@ LABL 0 新宋体,8,N - + E25FF0B6-41E2-4801-8FE9-337EF9B991F7 1522046451 zhenghong @@ -16299,7 +16310,7 @@ LABL 0 新宋体,8,N - + 1E64FE44-48BA-49B0-BDE1-66DA22B89EFF 1522046456 zhenghong @@ -16335,7 +16346,7 @@ LABL 0 新宋体,8,N - + DEE74089-6A6D-4D7E-BADD-76E4D08EFA2D 1522112691 zhenghong @@ -16371,7 +16382,7 @@ LABL 0 新宋体,8,N - + 5D44A212-AD69-4958-BAAF-9E16ED63FC67 1522112694 zhenghong @@ -16407,7 +16418,7 @@ LABL 0 新宋体,8,N - + ECA8F78C-7015-44EB-9CD2-F72634D7F4BD 1522114406 zhenghong @@ -16443,7 +16454,7 @@ LABL 0 新宋体,8,N - + 32BD37D4-4436-4069-9BD1-90CF0B1867E0 1522115961 zhenghong @@ -16479,7 +16490,7 @@ LABL 0 新宋体,8,N - + 1A23B754-71EE-4496-B70F-0A3268C6F651 1522115983 zhenghong @@ -16515,7 +16526,7 @@ LABL 0 新宋体,8,N - + 1C883E67-84F9-4CD0-A4F5-D7CA2BE15DC5 1522118676 zhenghong @@ -16551,7 +16562,7 @@ LABL 0 新宋体,8,N - + 1CE2FCCB-DF37-4C88-99DD-FA8C3EE7A09C 1522119056 zhenghong @@ -16587,7 +16598,7 @@ LABL 0 新宋体,8,N - + 7D8DC4F2-D0A4-4CE9-B03E-44AE166786C0 1522120295 zhenghong @@ -16623,7 +16634,7 @@ LABL 0 新宋体,8,N - + 7CB99F50-753B-4347-B896-1F18D8FE6691 1522138613 zhenghong @@ -16659,7 +16670,7 @@ LABL 0 新宋体,8,N - + EC89DA87-A575-4940-973B-665854268261 1522138618 zhenghong @@ -16695,7 +16706,7 @@ LABL 0 新宋体,8,N - + 8E1A22EC-2246-48C4-A499-3D8A4D264C09 1522138705 zhenghong @@ -16731,7 +16742,7 @@ LABL 0 新宋体,8,N - + 2EA7348D-C8E8-4FCC-8215-01FE3AD58DFB 1522141157 zhenghong @@ -16767,7 +16778,7 @@ LABL 0 新宋体,8,N - + 8B858AAC-D00A-42FE-BEDC-73536876C045 1522141232 zhenghong @@ -16803,7 +16814,7 @@ LABL 0 新宋体,8,N - + FC3A22FE-FD24-4DF0-BAC8-22659D3C8987 1522141317 zhenghong @@ -16839,7 +16850,7 @@ LABL 0 新宋体,8,N - + 14DB9C0C-F9F0-4D4A-B44E-592028F6E75A 1522142006 zhenghong @@ -16875,7 +16886,7 @@ LABL 0 新宋体,8,N - + 15304E84-71AA-40B1-84CB-904384B34B25 1522215975 zhenghong @@ -16911,7 +16922,7 @@ LABL 0 新宋体,8,N - + 457237AD-87EB-4A09-BA9F-36198B10D2FF 1522216015 zhenghong @@ -16947,7 +16958,7 @@ LABL 0 新宋体,8,N - + 3C2E5F27-A07C-4D88-9357-089D36122A25 1522216251 zhenghong @@ -16983,7 +16994,7 @@ LABL 0 新宋体,8,N - + A8FA4798-0F1E-4D96-A254-77F5D71F6BBD 1522216380 zhenghong @@ -17019,7 +17030,7 @@ LABL 0 新宋体,8,N - + 5026171A-4B51-4B83-A113-4051F1E4F415 1522220508 zhenghong @@ -17055,7 +17066,7 @@ LABL 0 新宋体,8,N - + 462222B9-A203-4D60-A353-A168356E3140 1522220546 zhenghong @@ -17091,7 +17102,7 @@ LABL 0 新宋体,8,N - + BD28F911-4F98-4C9D-9171-E99F60476E2A 1522224364 zhenghong @@ -17127,7 +17138,7 @@ LABL 0 新宋体,8,N - + 8D1675C9-7749-4831-A5E6-ACD971AACF57 1522225874 zhenghong @@ -17163,7 +17174,7 @@ LABL 0 新宋体,8,N - + B30347B3-4138-4EA8-A0F5-EF0D9A34E01F 1522226077 zhenghong @@ -17199,7 +17210,7 @@ LABL 0 新宋体,8,N - + 7D29D8DF-7EF1-4F43-928F-DDAC96A23858 1522226272 zhenghong @@ -17235,7 +17246,7 @@ LABL 0 新宋体,8,N - + EB0A7FB4-285A-4D5D-BC1D-E9B299069C1F 1522301998 zhenghong @@ -17271,7 +17282,7 @@ LABL 0 新宋体,8,N - + 942BBD31-85B8-46EA-893C-CB327C86F5BA 1522303390 zhenghong @@ -17307,7 +17318,7 @@ LABL 0 新宋体,8,N - + 1E5174EE-C0B0-4144-98D5-679634DCCAEE 1522303410 zhenghong @@ -17343,7 +17354,7 @@ LABL 0 新宋体,8,N - + BD55704C-3F36-44CC-90E1-143F097FA894 1522304178 zhenghong @@ -17379,7 +17390,7 @@ LABL 0 新宋体,8,N - + 17EC5CAA-580C-493D-9C2D-2EA3E9732A78 1522386868 zhenghong @@ -17415,7 +17426,7 @@ LABL 0 新宋体,8,N - + F469B162-D88C-42A3-B64C-7B2751A4FCE1 1522387461 zhenghong @@ -17451,7 +17462,7 @@ LABL 0 新宋体,8,N - + 1D18BF30-4375-4618-A1C9-6DC998F248E4 1522387526 zhenghong @@ -17487,7 +17498,7 @@ LABL 0 新宋体,8,N - + 183F9969-663E-4842-ABC2-C938F02C05E4 1522389232 zhenghong @@ -17523,7 +17534,7 @@ LABL 0 新宋体,8,N - + AC355266-228D-4333-8E95-D13F2D176DB4 1522390434 zhenghong @@ -17559,7 +17570,7 @@ LABL 0 新宋体,8,N - + 3A358827-AE90-4AC6-80E6-CA340D69F7F2 1522390644 zhenghong @@ -17595,7 +17606,7 @@ LABL 0 新宋体,8,N - + B0F12E0B-F2E6-40A6-AD2B-9FE858AAA8BE 1522391366 zhenghong @@ -17631,7 +17642,7 @@ LABL 0 新宋体,8,N - + F46C48A9-78A1-4C9A-BD75-DE0ED230A76D 1522391379 zhenghong @@ -17667,7 +17678,7 @@ LABL 0 新宋体,8,N - + 711AD4D5-212E-4E3B-BB26-DB79C4BE4E52 1522396648 zhenghong @@ -17703,7 +17714,7 @@ LABL 0 新宋体,8,N - + 094B7BE5-D0AB-4987-8D74-508A27D3117F 1522396864 zhenghong @@ -17739,7 +17750,7 @@ LABL 0 新宋体,8,N - + 8C15D427-62A0-40E7-9B02-84063CC6EB94 1522659209 zhenghong @@ -17772,10 +17783,10 @@ LABL 0 新宋体,8,N - + - + 043B7E7F-6688-42FD-BECE-3A4CE5A560F2 1522660753 zhenghong @@ -17785,7 +17796,7 @@ LABL 0 新宋体,8,N - + @@ -17811,7 +17822,7 @@ LABL 0 新宋体,8,N - + 3592DAA0-2C95-48CF-9359-C157A0E27DC3 1522660820 zhenghong @@ -17821,7 +17832,7 @@ LABL 0 新宋体,8,N - + @@ -17847,7 +17858,7 @@ LABL 0 新宋体,8,N - + BEE8D279-8DBF-40B3-899D-5B07570D0AD9 1522721755 zhenghong @@ -17883,7 +17894,7 @@ LABL 0 新宋体,8,N - + F5D0566A-35C3-4451-9C7D-782BC776C53E 1522724329 zhenghong @@ -17916,10 +17927,10 @@ LABL 0 新宋体,8,N - + - + 3AA8813B-9363-406A-91DF-4AD16E9C3CCA 1522725331 zhenghong @@ -17929,7 +17940,7 @@ LABL 0 新宋体,8,N - + @@ -17952,10 +17963,10 @@ LABL 0 新宋体,8,N - + - + DD05624A-7E08-4273-9758-C5EDA1A03134 1522733188 zhenghong @@ -17965,7 +17976,7 @@ LABL 0 新宋体,8,N - + @@ -17988,20 +17999,20 @@ LABL 0 新宋体,8,N - + - + EBF8A4B9-24B3-4D18-82FD-D12F847328C6 1522745521 zhenghong 1522745521 zhenghong - + - + @@ -18027,7 +18038,7 @@ LABL 0 新宋体,8,N - + BA7665F0-D173-45C6-AFE8-3C93CF330D79 1533109970 zhenghong @@ -18037,7 +18048,7 @@ LABL 0 新宋体,8,N - + @@ -18063,7 +18074,7 @@ LABL 0 新宋体,8,N - + 521484A5-B9C4-477D-8D45-97F7B15D7854 1533115829 zhenghong @@ -18073,7 +18084,7 @@ LABL 0 新宋体,8,N - + @@ -18099,7 +18110,7 @@ LABL 0 新宋体,8,N - + FCADB7B3-0636-44C7-8AB4-067148971867 1533115896 zhenghong @@ -18109,14 +18120,14 @@ LABL 0 新宋体,8,N - + - + 48492A0F-63AD-4453-B46B-89915CC87545 PUBLIC PUBLIC @@ -18127,7 +18138,7 @@ LABL 0 新宋体,8,N - + 232AA7B8-E743-48F3-9530-102684B229BE MySQL 5.0 MYSQL50 diff --git a/document/sql/mall.sql b/document/sql/mall.sql index 3fa86d0..31de4b8 100644 --- a/document/sql/mall.sql +++ b/document/sql/mall.sql @@ -10,7 +10,7 @@ Target Server Type : MYSQL Target Server Version : 50719 File Encoding : 65001 -Date: 2018-09-03 17:10:32 +Date: 2018-09-05 17:02:45 */ SET FOREIGN_KEY_CHECKS=0; @@ -379,16 +379,18 @@ CREATE TABLE `oms_order` ( `note` varchar(500) DEFAULT NULL COMMENT '订单备注', `confirm_status` int(1) DEFAULT NULL COMMENT '确认收货状态：0->未确认；1->已确认', `delete_status` int(1) NOT NULL DEFAULT '0' COMMENT '删除状态：0->未删除；1->已删除', + `use_integration` int(11) DEFAULT NULL COMMENT '下单时使用的积分', PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=16 DEFAULT CHARSET=utf8 COMMENT='订单表'; +) ENGINE=InnoDB AUTO_INCREMENT=17 DEFAULT CHARSET=utf8 COMMENT='订单表'; -- ---------------------------- -- Records of oms_order -- ---------------------------- -INSERT INTO `oms_order` VALUES ('12', '1', '2', null, '2018-09-03 16:24:27', 'test', '18732.00', '16377.75', '0.00', '2344.25', '0.00', '10.00', null, '0', '1', '0', '0', null, null, null, '0', null, '单品促销,打折优惠：满3件，打7.50折,满减优惠：满1000.00元，减120.00元,满减优惠：满1000.00元，减120.00元,无优惠', null, null, null, null, null, '大梨', '18033441849', '518000', '广东省', '深圳市', '福田区', '东晓街道', null, '0', '0'); -INSERT INTO `oms_order` VALUES ('13', '1', '2', null, '2018-09-03 16:24:29', 'test', '18732.00', '16377.75', '0.00', '2344.25', '0.00', '10.00', null, '0', '1', '0', '0', null, null, null, '0', null, '单品促销,打折优惠：满3件，打7.50折,满减优惠：满1000.00元，减120.00元,满减优惠：满1000.00元，减120.00元,无优惠', null, null, null, null, null, '大梨', '18033441849', '518000', '广东省', '深圳市', '福田区', '东晓街道', null, '0', '0'); -INSERT INTO `oms_order` VALUES ('14', '1', '2', null, '2018-09-03 16:57:40', 'test', '18732.00', '16377.75', '0.00', '2344.25', '0.00', '10.00', null, '0', '1', '0', '0', null, null, null, '18682', '18682', '单品促销,打折优惠：满3件，打7.50折,满减优惠：满1000.00元，减120.00元,满减优惠：满1000.00元，减120.00元,无优惠', null, null, null, null, null, '大梨', '18033441849', '518000', '广东省', '深圳市', '福田区', '东晓街道', null, '0', '0'); -INSERT INTO `oms_order` VALUES ('15', '1', '2', null, '2018-09-03 17:03:00', 'test', '18732.00', '16377.75', '0.00', '2344.25', '0.00', '10.00', null, '0', '1', '0', '0', null, null, null, '18682', '18682', '单品促销,打折优惠：满3件，打7.50折,满减优惠：满1000.00元，减120.00元,满减优惠：满1000.00元，减120.00元,无优惠', null, null, null, null, null, '大梨', '18033441849', '518000', '广东省', '深圳市', '福田区', '东晓街道', null, '0', '0'); +INSERT INTO `oms_order` VALUES ('12', '1', '2', null, '2018-09-05 12:24:27', 'test', '18732.00', '16377.75', '0.00', '2344.25', '0.00', '10.00', null, '0', '1', '1', '0', null, null, null, '0', null, '单品促销,打折优惠：满3件，打7.50折,满减优惠：满1000.00元，减120.00元,满减优惠：满1000.00元，减120.00元,无优惠', null, null, null, null, null, '大梨', '18033441849', '518000', '广东省', '深圳市', '福田区', '东晓街道', null, '0', '0', null); +INSERT INTO `oms_order` VALUES ('13', '1', '2', null, '2018-09-05 14:24:29', 'test', '18732.00', '16377.75', '0.00', '2344.25', '0.00', '10.00', null, '0', '1', '4', '0', null, null, null, '0', null, '单品促销,打折优惠：满3件，打7.50折,满减优惠：满1000.00元，减120.00元,满减优惠：满1000.00元，减120.00元,无优惠', null, null, null, null, null, '大梨', '18033441849', '518000', '广东省', '深圳市', '福田区', '东晓街道', null, '0', '0', '1000'); +INSERT INTO `oms_order` VALUES ('14', '1', '2', null, '2018-09-03 16:57:40', 'test', '18732.00', '16377.75', '0.00', '2344.25', '0.00', '10.00', null, '0', '1', '4', '0', null, null, null, '18682', '18682', '单品促销,打折优惠：满3件，打7.50折,满减优惠：满1000.00元，减120.00元,满减优惠：满1000.00元，减120.00元,无优惠', null, null, null, null, null, '大梨', '18033441849', '518000', '广东省', '深圳市', '福田区', '东晓街道', null, '0', '0', null); +INSERT INTO `oms_order` VALUES ('15', '1', '2', null, '2018-09-03 17:03:00', 'test', '18732.00', '16377.75', '0.00', '2344.25', '0.00', '10.00', null, '0', '1', '4', '0', null, null, null, '18682', '18682', '单品促销,打折优惠：满3件，打7.50折,满减优惠：满1000.00元，减120.00元,满减优惠：满1000.00元，减120.00元,无优惠', null, null, null, null, null, '大梨', '18033441849', '518000', '广东省', '深圳市', '福田区', '东晓街道', null, '0', '0', null); +INSERT INTO `oms_order` VALUES ('16', '1', '2', null, '2018-09-04 16:16:16', 'test', '18732.00', '16377.75', '0.00', '2344.25', '0.00', '10.00', null, '0', '1', '4', '0', null, null, null, '18682', '18682', '单品促销,打折优惠：满3件，打7.50折,满减优惠：满1000.00元，减120.00元,满减优惠：满1000.00元，减120.00元,无优惠', null, null, null, null, null, '大梨', '18033441849', '518000', '广东省', '深圳市', '福田区', '东晓街道', null, '0', '0', null); -- ---------------------------- -- Table structure for oms_order_item @@ -419,7 +421,7 @@ CREATE TABLE `oms_order_item` ( `gift_integration` int(11) DEFAULT '0', `gift_growth` int(11) DEFAULT '0', PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=41 DEFAULT CHARSET=utf8 COMMENT='订单中所包含的商品'; +) ENGINE=InnoDB AUTO_INCREMENT=46 DEFAULT CHARSET=utf8 COMMENT='订单中所包含的商品'; -- ---------------------------- -- Records of oms_order_item @@ -444,6 +446,11 @@ INSERT INTO `oms_order_item` VALUES ('37', '15', null, '27', null, '小米8', nu INSERT INTO `oms_order_item` VALUES ('38', '15', null, '28', null, '红米5A', null, null, '649.00', '1', '102', '201808270028001', '19', null, null, null, '满减优惠：满1000.00元，减120.00元', '57.60', '0.35', '0.00', '591.05', '0', '0'); INSERT INTO `oms_order_item` VALUES ('39', '15', null, '28', null, '红米5A', null, null, '699.00', '1', '103', '201808270028001', '19', null, null, null, '满减优惠：满1000.00元，减120.00元', '62.40', '0.37', '0.00', '636.23', '0', '0'); INSERT INTO `oms_order_item` VALUES ('40', '15', null, '29', null, 'Apple iPhone 8 Plus', null, null, '5499.00', '1', '106', '201808270029001', '19', null, null, null, '无优惠', '0.00', '2.94', '0.00', '5496.06', '0', '0'); +INSERT INTO `oms_order_item` VALUES ('41', '16', null, '26', null, '华为 HUAWEI P20', null, null, '3788.00', '1', '90', '201806070026001', '19', null, null, null, '单品促销', '200.00', '2.02', '0.00', '3585.98', '0', '0'); +INSERT INTO `oms_order_item` VALUES ('42', '16', null, '27', null, '小米8', null, null, '2699.00', '3', '98', '201808270027001', '19', null, null, null, '打折优惠：满3件，打7.50折', '674.75', '1.44', '0.00', '2022.81', '0', '0'); +INSERT INTO `oms_order_item` VALUES ('43', '16', null, '28', null, '红米5A', null, null, '649.00', '1', '102', '201808270028001', '19', null, null, null, '满减优惠：满1000.00元，减120.00元', '57.60', '0.35', '0.00', '591.05', '0', '0'); +INSERT INTO `oms_order_item` VALUES ('44', '16', null, '28', null, '红米5A', null, null, '699.00', '1', '103', '201808270028001', '19', null, null, null, '满减优惠：满1000.00元，减120.00元', '62.40', '0.37', '0.00', '636.23', '0', '0'); +INSERT INTO `oms_order_item` VALUES ('45', '16', null, '29', null, 'Apple iPhone 8 Plus', null, null, '5499.00', '1', '106', '201808270029001', '19', null, null, null, '无优惠', '0.00', '2.94', '0.00', '5496.06', '0', '0'); -- ---------------------------- -- Table structure for oms_order_operate_history @@ -530,11 +537,12 @@ CREATE TABLE `oms_order_setting` ( `finish_overtime` int(11) DEFAULT NULL COMMENT '自动完成交易时间，不能申请售后（天）', `comment_overtime` int(11) DEFAULT NULL COMMENT '订单完成后自动好评时间（天）', PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='订单设置表'; +) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COMMENT='订单设置表'; -- ---------------------------- -- Records of oms_order_setting -- ---------------------------- +INSERT INTO `oms_order_setting` VALUES ('1', '40', '60', '15', '7', '7'); -- ---------------------------- -- Table structure for pms_album @@ -1237,19 +1245,19 @@ INSERT INTO `pms_sku_stock` VALUES ('78', '23', '201806070023001', '99.00', '0', INSERT INTO `pms_sku_stock` VALUES ('79', '23', '201806070023002', '99.00', '0', null, '米白色', 'X', null, 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180604/1522738681.jpg', null, null, '0'); INSERT INTO `pms_sku_stock` VALUES ('80', '23', '201806070023003', '99.00', '0', null, '浅黄色', 'M', null, 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180604/2017091716493787_20170917164937650 (1).png', null, null, '0'); INSERT INTO `pms_sku_stock` VALUES ('81', '23', '201806070023004', '99.00', '0', null, '浅黄色', 'X', null, 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180604/2017091716493787_20170917164937650 (1).png', null, null, '0'); -INSERT INTO `pms_sku_stock` VALUES ('90', '26', '201806070026001', '3788.00', '500', null, '金色', '16G', null, null, null, '3588.00', '19'); +INSERT INTO `pms_sku_stock` VALUES ('90', '26', '201806070026001', '3788.00', '499', null, '金色', '16G', null, null, null, '3588.00', '-4'); INSERT INTO `pms_sku_stock` VALUES ('91', '26', '201806070026002', '3999.00', '500', null, '金色', '32G', null, null, null, '3799.00', '0'); INSERT INTO `pms_sku_stock` VALUES ('92', '26', '201806070026003', '3788.00', '500', null, '银色', '16G', null, null, null, '3588.00', '0'); INSERT INTO `pms_sku_stock` VALUES ('93', '26', '201806070026004', '3999.00', '500', null, '银色', '32G', null, null, null, '3799.00', '0'); -INSERT INTO `pms_sku_stock` VALUES ('98', '27', '201808270027001', '2699.00', '100', null, '黑色', '32G', null, null, null, null, '57'); +INSERT INTO `pms_sku_stock` VALUES ('98', '27', '201808270027001', '2699.00', '97', null, '黑色', '32G', null, null, null, null, '-12'); INSERT INTO `pms_sku_stock` VALUES ('99', '27', '201808270027002', '2999.00', '100', null, '黑色', '64G', null, null, null, null, '0'); INSERT INTO `pms_sku_stock` VALUES ('100', '27', '201808270027003', '2699.00', '100', null, '蓝色', '32G', null, null, null, null, '0'); INSERT INTO `pms_sku_stock` VALUES ('101', '27', '201808270027004', '2999.00', '100', null, '蓝色', '64G', null, null, null, null, '0'); -INSERT INTO `pms_sku_stock` VALUES ('102', '28', '201808270028001', '649.00', '100', null, '金色', '16G', null, null, null, null, '19'); -INSERT INTO `pms_sku_stock` VALUES ('103', '28', '201808270028002', '699.00', '100', null, '金色', '32G', null, null, null, null, '19'); +INSERT INTO `pms_sku_stock` VALUES ('102', '28', '201808270028001', '649.00', '99', null, '金色', '16G', null, null, null, null, '-4'); +INSERT INTO `pms_sku_stock` VALUES ('103', '28', '201808270028002', '699.00', '99', null, '金色', '32G', null, null, null, null, '-4'); INSERT INTO `pms_sku_stock` VALUES ('104', '28', '201808270028003', '649.00', '100', null, '银色', '16G', null, null, null, null, '0'); INSERT INTO `pms_sku_stock` VALUES ('105', '28', '201808270028004', '699.00', '100', null, '银色', '32G', null, null, null, null, '0'); -INSERT INTO `pms_sku_stock` VALUES ('106', '29', '201808270029001', '5499.00', '100', null, '金色', '32G', null, null, null, null, '19'); +INSERT INTO `pms_sku_stock` VALUES ('106', '29', '201808270029001', '5499.00', '99', null, '金色', '32G', null, null, null, null, '-4'); INSERT INTO `pms_sku_stock` VALUES ('107', '29', '201808270029002', '6299.00', '100', null, '金色', '64G', null, null, null, null, '0'); INSERT INTO `pms_sku_stock` VALUES ('108', '29', '201808270029003', '5499.00', '100', null, '银色', '32G', null, null, null, null, '0'); INSERT INTO `pms_sku_stock` VALUES ('109', '29', '201808270029004', '6299.00', '100', null, '银色', '64G', null, null, null, null, '0'); @@ -1286,7 +1294,7 @@ CREATE TABLE `sms_coupon` ( INSERT INTO `sms_coupon` VALUES ('2', '0', '全品类通用券', '0', '99', '10.00', '1', '100.00', '2018-08-27 16:40:47', '2018-09-15 16:40:47', '0', '满100减10', '100', '0', '1', '2018-08-27 16:40:47', null, null); INSERT INTO `sms_coupon` VALUES ('3', '0', '小米手机专用券', '0', '99', '50.00', '1', '1000.00', '2018-08-27 16:40:47', '2018-09-15 16:40:47', '2', '小米手机专用优惠券', '100', '0', '1', '2018-08-27 16:40:47', null, null); INSERT INTO `sms_coupon` VALUES ('4', '0', '手机品类专用券', '0', '99', '300.00', '1', '2000.00', '2018-08-27 16:40:47', '2018-09-15 16:40:47', '1', '手机分类专用优惠券', '100', '0', '1', '2018-08-27 16:40:47', null, null); -INSERT INTO `sms_coupon` VALUES ('7', '0', 'T恤分类专用优惠券', '0', '99', '50.00', '1', '500.00', '2018-08-27 16:40:47', '2018-08-15 16:40:47', '1', '满500减50', '100', '0', '1', '2018-08-27 16:40:47', null, null); +INSERT INTO `sms_coupon` VALUES ('7', '0', 'T恤分类专用优惠券', '0', '93', '50.00', '1', '500.00', '2018-08-27 16:40:47', '2018-08-15 16:40:47', '1', '满500减50', '100', '0', '7', '2018-08-27 16:40:47', null, null); -- ---------------------------- -- Table structure for sms_coupon_history @@ -1306,15 +1314,15 @@ CREATE TABLE `sms_coupon_history` ( PRIMARY KEY (`id`), KEY `idx_member_id` (`member_id`) USING BTREE, KEY `idx_coupon_id` (`coupon_id`) -) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8 COMMENT='优惠券使用、领取历史表'; +) ENGINE=InnoDB AUTO_INCREMENT=12 DEFAULT CHARSET=utf8 COMMENT='优惠券使用、领取历史表'; -- ---------------------------- -- Records of sms_coupon_history -- ---------------------------- -INSERT INTO `sms_coupon_history` VALUES ('2', '2', '1', null, 'windir', '1', '2018-08-29 14:04:12', '1', '2018-09-03 17:03:00', null); +INSERT INTO `sms_coupon_history` VALUES ('2', '2', '1', null, 'windir', '1', '2018-08-29 14:04:12', '0', '2018-09-04 16:16:16', null); INSERT INTO `sms_coupon_history` VALUES ('3', '3', '1', null, 'windir', '1', '2018-08-29 14:04:29', '0', null, null); INSERT INTO `sms_coupon_history` VALUES ('4', '4', '1', null, 'windir', '1', '2018-08-29 14:04:32', '0', null, null); -INSERT INTO `sms_coupon_history` VALUES ('5', '7', '1', null, 'windir', '1', '2018-08-29 14:04:37', '0', null, null); +INSERT INTO `sms_coupon_history` VALUES ('11', '7', '1', '4931048380330001', 'windir', '1', '2018-09-04 16:21:50', '0', null, null); -- ---------------------------- -- Table structure for sms_coupon_product_category_relation @@ -1607,7 +1615,7 @@ CREATE TABLE `ums_member` ( -- ---------------------------- -- Records of ums_member -- ---------------------------- -INSERT INTO `ums_member` VALUES ('1', '4', 'test', '202cb962ac59075b964b07152d234b70', 'windir', '18061581849', '1', '2018-08-02 10:35:44', null, '1', '2009-06-01', '上海', '学生', 'test', null, '1000', null, null, null); +INSERT INTO `ums_member` VALUES ('1', '4', 'test', '202cb962ac59075b964b07152d234b70', 'windir', '18061581849', '1', '2018-08-02 10:35:44', null, '1', '2009-06-01', '上海', '学生', 'test', null, '3000', null, null, null); INSERT INTO `ums_member` VALUES ('3', '4', 'test1', '698d51a19d8a121ce581499d7b701668', null, '18061581848', '1', '2018-08-03 16:46:38', null, null, null, null, null, null, null, null, null, null, null); -- ---------------------------- diff --git a/mall-admin/src/main/java/com/macro/mall/service/impl/SmsCouponServiceImpl.java b/mall-admin/src/main/java/com/macro/mall/service/impl/SmsCouponServiceImpl.java index 0424f4b..bdabf86 100644 --- a/mall-admin/src/main/java/com/macro/mall/service/impl/SmsCouponServiceImpl.java +++ b/mall-admin/src/main/java/com/macro/mall/service/impl/SmsCouponServiceImpl.java @@ -37,7 +37,6 @@ public class SmsCouponServiceImpl implements SmsCouponService { @Override public int add(SmsCouponParam couponParam) { //插入优惠券表 - // TODO: 2018/8/28 生成优惠券条码 int count = couponMapper.insert(couponParam); //插入优惠券和商品关系表 if(couponParam.getUseType().equals(2)){ 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 852267a..5cd6774 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 @@ -261,6 +261,13 @@ public class OmsOrder implements Serializable { */ private Integer deleteStatus; + /** + * 下单时使用的积分 + * + * @mbggenerated + */ + private Integer useIntegration; + private static final long serialVersionUID = 1L; public Long getId() { @@ -567,6 +574,14 @@ public class OmsOrder implements Serializable { this.deleteStatus = deleteStatus; } + public Integer getUseIntegration() { + return useIntegration; + } + + public void setUseIntegration(Integer useIntegration) { + this.useIntegration = useIntegration; + } + @Override public String toString() { StringBuilder sb = new StringBuilder(); @@ -611,6 +626,7 @@ public class OmsOrder implements Serializable { sb.append(", note=").append(note); sb.append(", confirmStatus=").append(confirmStatus); sb.append(", deleteStatus=").append(deleteStatus); + sb.append(", useIntegration=").append(useIntegration); 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 228a0fc..147b928 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 @@ -2555,6 +2555,66 @@ public class OmsOrderExample { addCriterion("delete_status not between", value1, value2, "deleteStatus"); return (Criteria) this; } + + public Criteria andUseIntegrationIsNull() { + addCriterion("use_integration is null"); + return (Criteria) this; + } + + public Criteria andUseIntegrationIsNotNull() { + addCriterion("use_integration is not null"); + return (Criteria) this; + } + + public Criteria andUseIntegrationEqualTo(Integer value) { + addCriterion("use_integration =", value, "useIntegration"); + return (Criteria) this; + } + + public Criteria andUseIntegrationNotEqualTo(Integer value) { + addCriterion("use_integration <>", value, "useIntegration"); + return (Criteria) this; + } + + public Criteria andUseIntegrationGreaterThan(Integer value) { + addCriterion("use_integration >", value, "useIntegration"); + return (Criteria) this; + } + + public Criteria andUseIntegrationGreaterThanOrEqualTo(Integer value) { + addCriterion("use_integration >=", value, "useIntegration"); + return (Criteria) this; + } + + public Criteria andUseIntegrationLessThan(Integer value) { + addCriterion("use_integration <", value, "useIntegration"); + return (Criteria) this; + } + + public Criteria andUseIntegrationLessThanOrEqualTo(Integer value) { + addCriterion("use_integration <=", value, "useIntegration"); + return (Criteria) this; + } + + public Criteria andUseIntegrationIn(List values) { + addCriterion("use_integration in", values, "useIntegration"); + return (Criteria) this; + } + + public Criteria andUseIntegrationNotIn(List values) { + addCriterion("use_integration not in", values, "useIntegration"); + return (Criteria) this; + } + + public Criteria andUseIntegrationBetween(Integer value1, Integer value2) { + addCriterion("use_integration between", value1, value2, "useIntegration"); + return (Criteria) this; + } + + public Criteria andUseIntegrationNotBetween(Integer value1, Integer value2) { + addCriterion("use_integration not between", value1, value2, "useIntegration"); + return (Criteria) this; + } } public static class Criteria extends GeneratedCriteria { 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 5946330..0bf08d5 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 @@ -40,6 +40,7 @@ + @@ -105,7 +106,8 @@ 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, delete_status + receiver_city, receiver_region, receiver_detail_address, note, confirm_status, delete_status, + use_integration @@ -523,6 +531,9 @@ delete_status = #{record.deleteStatus,jdbcType=INTEGER}, + + use_integration = #{record.useIntegration,jdbcType=INTEGER}, + @@ -567,7 +578,8 @@ receiver_detail_address = #{record.receiverDetailAddress,jdbcType=VARCHAR}, note = #{record.note,jdbcType=VARCHAR}, confirm_status = #{record.confirmStatus,jdbcType=INTEGER}, - delete_status = #{record.deleteStatus,jdbcType=INTEGER} + delete_status = #{record.deleteStatus,jdbcType=INTEGER}, + use_integration = #{record.useIntegration,jdbcType=INTEGER} @@ -686,6 +698,9 @@ delete_status = #{deleteStatus,jdbcType=INTEGER}, + + use_integration = #{useIntegration,jdbcType=INTEGER}, + where id = #{id,jdbcType=BIGINT} @@ -727,7 +742,8 @@ receiver_detail_address = #{receiverDetailAddress,jdbcType=VARCHAR}, note = #{note,jdbcType=VARCHAR}, confirm_status = #{confirmStatus,jdbcType=INTEGER}, - delete_status = #{deleteStatus,jdbcType=INTEGER} + delete_status = #{deleteStatus,jdbcType=INTEGER}, + use_integration = #{useIntegration,jdbcType=INTEGER} where id = #{id,jdbcType=BIGINT} \ No newline at end of file diff --git a/mall-portal/src/main/java/com/macro/mall/portal/component/OrderTimeOutCancelTask.java b/mall-portal/src/main/java/com/macro/mall/portal/component/OrderTimeOutCancelTask.java index 91a8da9..8ee4c54 100644 --- a/mall-portal/src/main/java/com/macro/mall/portal/component/OrderTimeOutCancelTask.java +++ b/mall-portal/src/main/java/com/macro/mall/portal/component/OrderTimeOutCancelTask.java @@ -1,7 +1,10 @@ package com.macro.mall.portal.component; +import com.macro.mall.portal.domain.CommonResult; +import com.macro.mall.portal.service.OmsPortalOrderService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -12,13 +15,16 @@ import org.springframework.stereotype.Component; @Component public class OrderTimeOutCancelTask { private Logger LOGGER =LoggerFactory.getLogger(OrderTimeOutCancelTask.class); + @Autowired + private OmsPortalOrderService portalOrderService; /** * cron表达式：Seconds Minutes Hours DayofMonth Month DayofWeek [Year] - * 每10分钟扫描一次，扫描超时时间*2时间内所下订单，如果没支付则取消该订单 + * 每10分钟扫描一次，扫描设定超时时间之前下的订单，如果没支付则取消该订单 */ @Scheduled(cron = "0 0/10 * ? * ?") private void cancelTimeOutOrder(){ - LOGGER.info("取消订单，并根据sku编号释放锁定库存"); + CommonResult result = portalOrderService.cancelTimeOutOrder(); + LOGGER.info("取消订单，并根据sku编号释放锁定库存:{}",result); } } 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 index 9581cd7..8a13f24 100644 --- 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 @@ -8,10 +8,7 @@ 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.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.*; /** * 订单管理Controller @@ -37,4 +34,17 @@ public class OmsPortalOrderController { public Object generateOrder(@RequestBody OrderParam orderParam){ return portalOrderService.generateOrder(orderParam); } + @ApiOperation("支付成功的回调") + @RequestMapping(value = "/paySuccess",method = RequestMethod.POST) + @ResponseBody + public Object paySuccess(@RequestParam Long orderId){ + return portalOrderService.paySuccess(orderId); + } + + @ApiOperation("自动取消超时订单") + @RequestMapping(value = "/cancelTimeOutOrder",method = RequestMethod.POST) + @ResponseBody + public Object cancelTimeOutOrder(){ + return portalOrderService.cancelTimeOutOrder(); + } } diff --git a/mall-portal/src/main/java/com/macro/mall/portal/dao/PortalOrderDao.java b/mall-portal/src/main/java/com/macro/mall/portal/dao/PortalOrderDao.java new file mode 100644 index 0000000..8be283d --- /dev/null +++ b/mall-portal/src/main/java/com/macro/mall/portal/dao/PortalOrderDao.java @@ -0,0 +1,40 @@ +package com.macro.mall.portal.dao; + +import com.macro.mall.model.OmsOrderItem; +import com.macro.mall.portal.domain.OmsOrderDetail; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 前台订单自定义Dao + * Created by macro on 2018/9/4. + */ +public interface PortalOrderDao { + /** + * 获取订单及下单商品详情 + */ + OmsOrderDetail getDetail(@Param("orderId") Long orderId); + + /** + * 修改 pms_sku_stock表的锁定库存及真实库存 + */ + int updateSkuStock(@Param("itemList") List orderItemList); + + /** + * 获取超时订单 + * @param minute 超时时间（分） + */ + List getTimeOutOrders(@Param("minute") Integer minute); + + /** + * 批量修改订单状态 + */ + int updateOrderStatus(@Param("ids") List ids,@Param("status") Integer status); + + /** + * 解除取消订单的库存锁定 + */ + int releaseSkuStockLock(@Param("itemList") List orderItemList); + +} diff --git a/mall-portal/src/main/java/com/macro/mall/portal/domain/OmsOrderDetail.java b/mall-portal/src/main/java/com/macro/mall/portal/domain/OmsOrderDetail.java new file mode 100644 index 0000000..065d563 --- /dev/null +++ b/mall-portal/src/main/java/com/macro/mall/portal/domain/OmsOrderDetail.java @@ -0,0 +1,22 @@ +package com.macro.mall.portal.domain; + +import com.macro.mall.model.OmsOrder; +import com.macro.mall.model.OmsOrderItem; + +import java.util.List; + +/** + * 包含订单商品信息的订单详情 + * Created by macro on 2018/9/4. + */ +public class OmsOrderDetail extends OmsOrder { + private List orderItemList; + + public List getOrderItemList() { + return orderItemList; + } + + public void setOrderItemList(List orderItemList) { + this.orderItemList = orderItemList; + } +} 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 index 4299528..059d70a 100644 --- 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 @@ -20,4 +20,16 @@ public interface OmsPortalOrderService { */ @Transactional CommonResult generateOrder(OrderParam orderParam); + + /** + * 支付成功后的回调 + */ + @Transactional + CommonResult paySuccess(Long orderId); + + /** + * 自动取消超时订单 + */ + @Transactional + CommonResult cancelTimeOutOrder(); } diff --git a/mall-portal/src/main/java/com/macro/mall/portal/service/RedisService.java b/mall-portal/src/main/java/com/macro/mall/portal/service/RedisService.java index 3ac8312..bc1bf81 100644 --- a/mall-portal/src/main/java/com/macro/mall/portal/service/RedisService.java +++ b/mall-portal/src/main/java/com/macro/mall/portal/service/RedisService.java @@ -25,4 +25,11 @@ public interface RedisService { * 删除数据 */ void remove(String key); + + /** + * 自增操作 + * @param delta 自增步长 + */ + Long increment(String key, long delta); + } diff --git a/mall-portal/src/main/java/com/macro/mall/portal/service/UmsMemberService.java b/mall-portal/src/main/java/com/macro/mall/portal/service/UmsMemberService.java index 573c701..eee8d1b 100644 --- a/mall-portal/src/main/java/com/macro/mall/portal/service/UmsMemberService.java +++ b/mall-portal/src/main/java/com/macro/mall/portal/service/UmsMemberService.java @@ -14,6 +14,11 @@ public interface UmsMemberService { */ UmsMember getByUsername(String username); + /** + * 根据会员编号获取会员 + */ + UmsMember getById(Long id); + /** * 用户注册 */ @@ -35,4 +40,9 @@ public interface UmsMemberService { * 获取当前登录会员 */ UmsMember getCurrentMember(); + + /** + * 根据会员id修改会员积分 + */ + void updateIntegration(Long id,Integer integration); } 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 index e70e7b6..720539f 100644 --- 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 @@ -1,20 +1,20 @@ package com.macro.mall.portal.service.impl; -import com.macro.mall.mapper.OmsOrderMapper; -import com.macro.mall.mapper.PmsSkuStockMapper; -import com.macro.mall.mapper.SmsCouponHistoryMapper; -import com.macro.mall.mapper.UmsIntegrationConsumeSettingMapper; +import com.macro.mall.mapper.*; import com.macro.mall.model.*; +import com.macro.mall.portal.dao.PortalOrderDao; import com.macro.mall.portal.dao.PortalOrderItemDao; import com.macro.mall.portal.dao.SmsCouponHistoryDao; import com.macro.mall.portal.domain.*; import com.macro.mall.portal.service.*; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import java.math.BigDecimal; import java.math.RoundingMode; +import java.text.SimpleDateFormat; import java.util.*; /** @@ -43,7 +43,14 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService { private PortalOrderItemDao orderItemDao; @Autowired private SmsCouponHistoryMapper couponHistoryMapper; - + @Autowired + private RedisService redisService; + @Value("${redis.key.prefix.orderId}") + private String REDIS_KEY_PREFIX_ORDER_ID; + @Autowired + private PortalOrderDao portalOrderDao; + @Autowired + private OmsOrderSettingMapper orderSettingMapper; @Override public ConfirmOrderResult generateConfirmOrder() { ConfirmOrderResult result = new ConfirmOrderResult(); @@ -184,15 +191,25 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService { order.setIntegration(calcGifIntegration(orderItemList)); //计算赠送成长值 order.setGrowth(calcGiftGrowth(orderItemList)); - // TODO: 2018/9/3 order_sn,bill_*,delivery_* + //生成订单号 + order.setOrderSn(generateOrderSn(order)); + // TODO: 2018/9/3 bill_*,delivery_* //插入order表和order_item表 orderMapper.insert(order); for (OmsOrderItem orderItem : orderItemList) { orderItem.setOrderId(order.getId()); + orderItem.setOrderSn(order.getOrderSn()); } orderItemDao.insertList(orderItemList); - //更新优惠券使用状态 - updateCouponStatus(orderParam.getCouponId(),currentMember); + //如使用优惠券更新优惠券使用状态 + if(orderParam.getCouponId()!=null){ + updateCouponStatus(orderParam.getCouponId(),currentMember.getId(),1); + } + //如使用积分需要扣除积分 + if(orderParam.getUseIntegration()!=null){ + order.setUseIntegration(orderParam.getUseIntegration()); + memberService.updateIntegration(currentMember.getId(),currentMember.getIntegration()-orderParam.getUseIntegration()); + } //删除购物车中的下单商品 deleteCartItemList(cartPromotionItemList,currentMember); Map result = new HashMap<>(); @@ -201,6 +218,67 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService { return new CommonResult().success("下单成功", result); } + @Override + public CommonResult paySuccess(Long orderId) { + //修改订单支付状态 + OmsOrder order = new OmsOrder(); + order.setId(orderId); + order.setStatus(1); + orderMapper.updateByPrimaryKeySelective(order); + //恢复所有下单商品的锁定库存，扣减真实库存 + OmsOrderDetail orderDetail = portalOrderDao.getDetail(orderId); + int count = portalOrderDao.updateSkuStock(orderDetail.getOrderItemList()); + return new CommonResult().success("支付成功",count); + } + + @Override + public CommonResult cancelTimeOutOrder() { + OmsOrderSetting orderSetting = orderSettingMapper.selectByPrimaryKey(1L); + //查询超时、未支付的订单及订单详情 + List timeOutOrders = portalOrderDao.getTimeOutOrders(orderSetting.getNormalOrderOvertime()); + if(CollectionUtils.isEmpty(timeOutOrders)){ + return new CommonResult().failed("暂无超时订单"); + } + //修改订单状态为交易取消 + List ids = new ArrayList<>(); + for (OmsOrderDetail timeOutOrder : timeOutOrders) { + ids.add(timeOutOrder.getId()); + } + portalOrderDao.updateOrderStatus(ids,4); + for (OmsOrderDetail timeOutOrder : timeOutOrders) { + //解除订单商品库存锁定 + portalOrderDao.releaseSkuStockLock(timeOutOrder.getOrderItemList()); + //修改优惠券使用状态 + updateCouponStatus(timeOutOrder.getCouponId(),timeOutOrder.getMemberId(),0); + //返还使用积分 + if(timeOutOrder.getUseIntegration()!=null){ + UmsMember member = memberService.getById(timeOutOrder.getMemberId()); + memberService.updateIntegration(timeOutOrder.getMemberId(),member.getIntegration()+timeOutOrder.getUseIntegration()); + } + } + return new CommonResult().success(null); + } + + /** + * 生成18位订单编号:8位日期+2位平台号码+2位支付方式+6位以上自增id + */ + private String generateOrderSn(OmsOrder order) { + StringBuilder sb = new StringBuilder(); + String date = new SimpleDateFormat("yyyyMMdd").format(new Date()); + String key = REDIS_KEY_PREFIX_ORDER_ID + date; + Long increment = redisService.increment(key, 1); + sb.append(date); + sb.append(String.format("%02d",order.getSourceType())); + sb.append(String.format("%02d",order.getPayType())); + String incrementStr = increment.toString(); + if(incrementStr.length()<=6){ + sb.append(String.format("%06d",increment)); + }else{ + sb.append(incrementStr); + } + return sb.toString(); + } + /** * 删除下单商品的购物车信息 */ @@ -235,22 +313,22 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService { } /** - * 更新sms_coupon_history的可用信息 + * 将优惠券信息更改为指定状态 * @param couponId 优惠券id - * @param currentMember 当前会员 + * @param memberId 会员id + * @param useStatus 0->未使用；1->已使用 */ - private void updateCouponStatus(Long couponId, UmsMember currentMember) { - SmsCouponHistory record = new SmsCouponHistory(); - record.setUseStatus(1); - //查询第一张未使用优惠券 + private void updateCouponStatus(Long couponId, Long memberId,Integer useStatus) { + if(couponId==null)return; + //查询第一张优惠券 SmsCouponHistoryExample example = new SmsCouponHistoryExample(); - example.createCriteria().andMemberIdEqualTo(currentMember.getId()) - .andCouponIdEqualTo(couponId).andUseStatusEqualTo(0); + example.createCriteria().andMemberIdEqualTo(memberId) + .andCouponIdEqualTo(couponId).andUseStatusEqualTo(useStatus==0?1:0); List couponHistoryList = couponHistoryMapper.selectByExample(example); if(!CollectionUtils.isEmpty(couponHistoryList)){ SmsCouponHistory couponHistory = couponHistoryList.get(0); couponHistory.setUseTime(new Date()); - couponHistory.setUseStatus(1); + couponHistory.setUseStatus(useStatus); couponHistoryMapper.updateByPrimaryKeySelective(couponHistory); } } diff --git a/mall-portal/src/main/java/com/macro/mall/portal/service/impl/RedisServiceImpl.java b/mall-portal/src/main/java/com/macro/mall/portal/service/impl/RedisServiceImpl.java index 05aaf8d..8426397 100644 --- a/mall-portal/src/main/java/com/macro/mall/portal/service/impl/RedisServiceImpl.java +++ b/mall-portal/src/main/java/com/macro/mall/portal/service/impl/RedisServiceImpl.java @@ -35,4 +35,9 @@ public class RedisServiceImpl implements RedisService { public void remove(String key) { stringRedisTemplate.delete(key); } + + @Override + public Long increment(String key, long delta) { + return stringRedisTemplate.opsForValue().increment(key,delta); + } } diff --git a/mall-portal/src/main/java/com/macro/mall/portal/service/impl/UmsMemberCouponServiceImpl.java b/mall-portal/src/main/java/com/macro/mall/portal/service/impl/UmsMemberCouponServiceImpl.java index 513b9e6..796b7fe 100644 --- a/mall-portal/src/main/java/com/macro/mall/portal/service/impl/UmsMemberCouponServiceImpl.java +++ b/mall-portal/src/main/java/com/macro/mall/portal/service/impl/UmsMemberCouponServiceImpl.java @@ -13,9 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; +import java.util.*; /** * 会员优惠券管理Service实现类 @@ -56,7 +54,7 @@ public class UmsMemberCouponServiceImpl implements UmsMemberCouponService { //生成领取优惠券历史 SmsCouponHistory couponHistory = new SmsCouponHistory(); couponHistory.setCouponId(couponId); - couponHistory.setCouponCode(coupon.getCode()); + couponHistory.setCouponCode(generateCouponCode(currentMember.getId())); couponHistory.setCreateTime(now); couponHistory.setMemberId(currentMember.getId()); couponHistory.setMemberNickname(currentMember.getNickname()); @@ -72,6 +70,26 @@ public class UmsMemberCouponServiceImpl implements UmsMemberCouponService { return new CommonResult().success("领取成功",null); } + /** + * 16位优惠码生成：时间戳后8位+4位随机数+用户id后4位 + */ + private String generateCouponCode(Long memberId) { + StringBuilder sb = new StringBuilder(); + Long currentTimeMillis = System.currentTimeMillis(); + String timeMillisStr = currentTimeMillis.toString(); + sb.append(timeMillisStr.substring(timeMillisStr.length() - 8)); + for (int i = 0; i < 4; i++) { + sb.append(new Random().nextInt(10)); + } + String memberIdStr = memberId.toString(); + if (memberIdStr.length() <= 4) { + sb.append(String.format("%04d", memberId)); + } else { + sb.append(memberIdStr.substring(memberIdStr.length()-4)); + } + return sb.toString(); + } + @Override public List list(Integer useStatus) { UmsMember currentMember = memberService.getCurrentMember(); diff --git a/mall-portal/src/main/java/com/macro/mall/portal/service/impl/UmsMemberServiceImpl.java b/mall-portal/src/main/java/com/macro/mall/portal/service/impl/UmsMemberServiceImpl.java index 6b2b45f..0a40893 100644 --- a/mall-portal/src/main/java/com/macro/mall/portal/service/impl/UmsMemberServiceImpl.java +++ b/mall-portal/src/main/java/com/macro/mall/portal/service/impl/UmsMemberServiceImpl.java @@ -54,6 +54,11 @@ public class UmsMemberServiceImpl implements UmsMemberService { return null; } + @Override + public UmsMember getById(Long id) { + return memberMapper.selectByPrimaryKey(id); + } + @Override public CommonResult register(String username, String password, String telephone, String authCode) { //验证验证码 @@ -125,6 +130,15 @@ public class UmsMemberServiceImpl implements UmsMemberService { MemberDetails memberDetails = (MemberDetails) auth.getPrincipal(); return memberDetails.getUmsMember(); } + + @Override + public void updateIntegration(Long id, Integer integration) { + UmsMember record=new UmsMember(); + record.setId(id); + record.setIntegration(integration); + memberMapper.updateByPrimaryKeySelective(record); + } + //对输入的验证码进行校验 private boolean verifyAuthCode(String authCode, String telephone){ if(StringUtils.isEmpty(authCode)){ diff --git a/mall-portal/src/main/resources/application.properties b/mall-portal/src/main/resources/application.properties index ff89797..feceec7 100644 --- a/mall-portal/src/main/resources/application.properties +++ b/mall-portal/src/main/resources/application.properties @@ -11,6 +11,7 @@ mybatis.mapper-locations=classpath:dao/*.xml,classpath*:com/**/mapper/*.xml #===redis custom key start=== redis.key.prefix.authCode=portal:authCode: +redis.key.prefix.orderId=portal:orderId: authCode.expire.seconds=90 #===redis custom key end=== diff --git a/mall-portal/src/main/resources/dao/PortalOrderDao.xml b/mall-portal/src/main/resources/dao/PortalOrderDao.xml new file mode 100644 index 0000000..b51fa5e --- /dev/null +++ b/mall-portal/src/main/resources/dao/PortalOrderDao.xml @@ -0,0 +1,91 @@ + + + + + + + + + + + + + UPDATE pms_sku_stock + SET + stock = CASE id + + WHEN #{item.productSkuId} THEN stock - #{item.productQuantity} + + END, + lock_stock = CASE id + + WHEN #{item.productSkuId} THEN lock_stock - #{item.productQuantity} + + END + WHERE + id IN + + #{item.productSkuId} + + + + update oms_order + set status=#{status} + where id in + + #{id} + + + + UPDATE pms_sku_stock + SET + lock_stock = CASE id + + WHEN #{item.productSkuId} THEN lock_stock - #{item.productQuantity} + + END + WHERE + id IN + + #{item.productSkuId} + + + \ No newline at end of file