251 Commits

Author	SHA1	Message	Date
602090531@qq.com	8f5ab606ce	Merge branch 'sit-Carl' into LTL_20220314 ... # Conflicts: # smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/OrderController.java	2022-03-17 15:35:27 +08:00
602090531@qq.com	57f05da254	解决未到生效时间优惠券显示的问题	2022-03-17 15:26:05 +08:00
602090531@qq.com	b9361b8eea	记录解密后的data的log数据	2022-03-17 10:09:27 +08:00
Admin	ffb99232e8	!237 adding AES logic . ... Merge pull request !237 from Admin/sit-Carl-V3	2022-03-16 09:11:47 +00:00
376654749@qq.com	359d746638	modify order logic	2022-03-16 17:01:21 +08:00
Admin	4af5435bb8	!236 add resp body log ... Merge pull request !236 from Admin/LTL_20220314	2022-03-16 02:28:49 +00:00
602090531@qq.com	e4fa95fbbc	增加日志列的数据记录	2022-03-16 10:12:47 +08:00
376654749@qq.com	cd6a9f9e27	modify order logic	2022-03-15 16:31:35 +08:00
376654749@qq.com	1417dbc64f	adding CouponGetAllEntity logic	2022-03-15 14:59:42 +08:00
376654749@qq.com	a18da2e2e5	adding order logic	2022-03-15 11:40:13 +08:00
376654749@qq.com	404d870b7d	adding order logic	2022-03-14 17:22:19 +08:00
376654749@qq.com	1b4f4c286d	coupon Date	2022-03-14 15:57:21 +08:00
376654749@qq.com	b3ddebce4e	coupon Date	2022-03-14 15:18:34 +08:00
376654749@qq.com	666b2c581d	coupon Date	2022-03-14 15:02:31 +08:00
376654749@qq.com	eed393bb5d	adding AES logic	2022-03-14 10:48:53 +08:00
Carl	7b4b9050b7	debugger	2022-03-11 21:44:06 +08:00
Carl	1d764bb994	debugger	2022-03-11 21:38:45 +08:00
Carl	98e6a6f329	debugger	2022-03-11 21:19:19 +08:00
376654749@qq.com	2f0ba25c69	adding generateOrder error msg logic	2022-03-11 17:07:41 +08:00
376654749@qq.com	ac5c91d901	adding generateOrder error msg logic	2022-03-11 15:29:14 +08:00
376654749@qq.com	fc878707a0	adding generateOrder error msg logic	2022-03-10 12:01:13 +08:00
376654749@qq.com	e057f0cce0	adding filter coupon logic .	2022-03-10 10:57:16 +08:00
376654749@qq.com	9c4e7baf8c	adding filter coupon logic .	2022-03-10 10:07:00 +08:00
Carl	81aca06946	modify generate order error logic statement	2022-03-04 18:21:43 +08:00
Carl	2d59387ac8	add filter H5 coupond data	2022-02-22 14:29:17 +08:00
Carl	54af67ee4a	add remark value;	2022-02-21 14:26:18 +08:00
Carl	f713627e5d	add remark value;	2022-02-21 11:32:30 +08:00
Carl	fe5eb1373b	add remark value;	2022-02-21 11:15:04 +08:00
Carl	bafd4c0120	filter data except H5 data	2022-02-18 16:09:53 +08:00
Carl	a6860b3c3e	filter data except H5 data	2022-02-18 15:58:59 +08:00
Carl	bd24abd220	filter data except H5 data	2022-02-18 15:50:21 +08:00
Carl	d2d0461ecf	filter data except H5 data	2022-02-18 12:10:43 +08:00
Carl	94524aea9d	modify CouponConfigFindAllEntity	2022-02-17 17:34:02 +08:00
Carl	a41ecf84c3	add regOrlogin logs	2022-02-17 10:45:17 +08:00
Carl	d228a3c2c7	modify default value OrderDatilList status 0->2	2022-02-16 12:10:09 +08:00
Carl	1c50dea02a	fix Alipay error	2022-02-15 16:38:33 +08:00
Carl	a688f452ad	fix Alipay error	2022-02-15 16:13:11 +08:00
Carl	9467be098e	fix Alipay error	2022-02-15 16:07:28 +08:00
Carl	d4e107dcab	fix Alipay error	2022-02-15 15:49:22 +08:00
Admin	adb5e1f32d	删除文件 smart-admin-service/smart-admin-api/src/main/resources/static/30_1.png	2022-02-15 07:41:24 +00:00
Admin	c4bb740859	删除文件 smart-admin-service/smart-admin-api/src/main/resources/static/30_1.jpg	2022-02-15 07:40:54 +00:00
Carl	c5444db2ee	fix Alipay error	2022-02-15 14:53:07 +08:00
Carl	3978b640ef	fix Alipay error	2022-02-15 12:14:53 +08:00
Carl	823e929aa4	fix Alipay error	2022-02-15 12:01:39 +08:00
Carl	0746ff4e83	exchange img	2022-02-15 11:45:27 +08:00
Carl	6bbfd08f73	exchange img	2022-02-15 11:41:51 +08:00
Carl	992b5f59cd	exchange img	2022-02-15 11:36:55 +08:00
Carl	3f8da3c192	adding JSAPI	2022-02-14 18:25:54 +08:00
Carl	76451f14d7	Alipay model	2022-02-14 15:01:35 +08:00
Carl	6cd5f21a56	adding PaymentResult and synchronization order	2022-02-10 18:23:19 +08:00