qng 314f51a3a5 Merge remote-tracking branch 'origin/master' into feature/支付单重推和bug修复1213 3 anni fa
..
alarm 0168eb64f2 1.出货提醒,订货提醒excel导出功能 4 anni fa
compared 749daca3b6 对比支付单模块优化 3 anni fa
faceid a1d2220945 kmall-pt-general 提交 5 anni fa
haikong 02df3a9373 定时器重新推送失败的订单 3 anni fa
kmall2eccs 8f9374739d 1.支付单、税单模板添加 4 anni fa
mk d41cf24337 活动形式管理积分页面优化 3 anni fa
oms2kmall f70d883804 优化产品备案回调判断 3 anni fa
record 7ca2bb108b 还原查验单库存不能还原多次,还原后订单状态改为已发货 3 anni fa
shop 8f9374739d 1.支付单、税单模板添加 4 anni fa
statistics 37bd103674 1.产品top10改成top50 4 anni fa
vip edbf69a606 bug修复 3 anni fa
AdPositionServiceImpl.java a1d2220945 kmall-pt-general 提交 5 anni fa
AdServiceImpl.java a1d2220945 kmall-pt-general 提交 5 anni fa
AddressInfoServiceImpl.java d0a2acbb61 快递面单打印需求 4 anni fa
AddressServiceImpl.java 14c09311c9 积分回退接口 3 anni fa
AttributeCategoryServiceImpl.java a1d2220945 kmall-pt-general 提交 5 anni fa
AttributeServiceImpl.java a1d2220945 kmall-pt-general 提交 5 anni fa
BrandServiceImpl.java e4f96fb7cb 品牌制造商界面和导入优化 3 anni fa
CartServiceImpl.java a1d2220945 kmall-pt-general 提交 5 anni fa
CashierLoginRecordServiceImpl.java 2f736afcdb 新增库对应的结构(dao、service、controller、entity、html、js) 4 anni fa
CashierServiceImpl.java be41cf1650 修复bug 4 anni fa
CategoryServiceImpl.java 7b4a7e30bb 商品类型页面优化和修复bug 3 anni fa
ChannelServiceImpl.java a1d2220945 kmall-pt-general 提交 5 anni fa
CollectServiceImpl.java a1d2220945 kmall-pt-general 提交 5 anni fa
CommentPictureServiceImpl.java a1d2220945 kmall-pt-general 提交 5 anni fa
CommentServiceImpl.java a1d2220945 kmall-pt-general 提交 5 anni fa
CouponGoodsServiceImpl.java a1d2220945 kmall-pt-general 提交 5 anni fa
CouponServiceImpl.java a1d2220945 kmall-pt-general 提交 5 anni fa
ExportExceptionDataServiceImpl.java a1d2220945 kmall-pt-general 提交 5 anni fa
ExpressCompanySysServiceImpl.java 7ed41a6c67 修改门店关联快递逻辑 4 anni fa
FeedbackServiceImpl.java a1d2220945 kmall-pt-general 提交 5 anni fa
FootprintServiceImpl.java a1d2220945 kmall-pt-general 提交 5 anni fa
FreightItemServiceImpl.java a1d2220945 kmall-pt-general 提交 5 anni fa
FreightServiceImpl.java a1d2220945 kmall-pt-general 提交 5 anni fa
GoodsAttributeServiceImpl.java a1d2220945 kmall-pt-general 提交 5 anni fa
GoodsBatchServiceImpl.java 8d1476b796 xwh提交代码 4 anni fa
GoodsGalleryServiceImpl.java a1d2220945 kmall-pt-general 提交 5 anni fa
GoodsGroupOpenServiceImpl.java a1d2220945 kmall-pt-general 提交 5 anni fa
GoodsGroupServiceImpl.java a1d2220945 kmall-pt-general 提交 5 anni fa
GoodsHistoryPriceServiceImpl.java a2cf814bff 提交代码避免覆盖代码 4 anni fa
GoodsIssueServiceImpl.java a1d2220945 kmall-pt-general 提交 5 anni fa
GoodsLabelHeadServiceImpl.java ebd8719684 增加标签头维护 4 anni fa
GoodsProductServiceImpl.java aa6984ca4d 修改取货码为小票码和增加收银端sku列 3 anni fa
GoodsServiceImpl.java 56ca844d83 bug修复 3 anni fa
GoodsSpecificationServiceImpl.java a1d2220945 kmall-pt-general 提交 5 anni fa
GoodsTransportInfoDetailServiceImpl.java 8380756a48 修复BUG 4 anni fa
GoodsTransportInfoServiceImpl.java fe082e8b09 xwh增加在途库存crud 4 anni fa
HelpIssueServiceImpl.java a1d2220945 kmall-pt-general 提交 5 anni fa
HelpTypeServiceImpl.java a1d2220945 kmall-pt-general 提交 5 anni fa
InterfaceSendLogServiceImpl.java 058def0cd6 小票打印、收发货地址、系统日志以及小票颜色变更逻辑等 3 anni fa
KeywordsServiceImpl.java a1d2220945 kmall-pt-general 提交 5 anni fa
MallPaymentOrderDataServiceImpl.java 1c305477c3 修改对比支付单和添加支付订单搜索 3 anni fa
MerchServiceImpl.java 4e0c59376a 修复页面bug 3 anni fa
MkActivitiesCombinationPriceServiceImpl.java 69cc0c1008 修复BUG 4 anni fa
MkActivitiesCouponServiceImpl.java a7303bf061 活动流程优化,活动新增优先级处理,营销活动前端页面修改 3 anni fa
MkActivitiesDiscountServiceImpl.java c8c5ba1b8e 1.修改退款逻辑 4 anni fa
MkActivitiesFullGiftServiceImpl.java abfd774880 活动相关 3 anni fa
MkActivitiesFullReductionServiceImpl.java c8c5ba1b8e 1.修改退款逻辑 4 anni fa
MkActivitiesGetOneFreeGoodsServiceImpl.java c8c5ba1b8e 1.修改退款逻辑 4 anni fa
MkActivitiesHalfPriceServiceImpl.java c8c5ba1b8e 1.修改退款逻辑 4 anni fa
MkActivitiesPromotionServiceImpl.java 484414ef57 限时特价新增是否参与积分抵扣字段 3 anni fa
MkDailyActivitiesServiceImpl.java 9355cb632c 1.增加应用最高价与最低价和自定义价格的按钮 4 anni fa
MngChangeServiceImpl.java a1d2220945 kmall-pt-general 提交 5 anni fa
OfflineCartServiceImpl.java a1368a6de5 会员变动记录,同步会员消费订单 3 anni fa
OrderAlipayRecordServiceImpl.java 9a6ff1d8b7 添加了支付宝支付 5 anni fa
OrderExceptionRecordServiceImpl.java a1d2220945 kmall-pt-general 提交 5 anni fa
OrderGoodsServiceImpl.java 828b82439a 下单流程修改,去除mq配置 3 anni fa
OrderProcessRecordServiceImpl.java 537714ea26 支付凭证回传,商品详情主图 3 anni fa
OrderRefundServiceImpl.java c8c9276af7 1.修改税单异常的bug 4 anni fa
OrderServiceImpl.java 314f51a3a5 Merge remote-tracking branch 'origin/master' into feature/支付单重推和bug修复1213 3 anni fa
OrderWXPayRecordServiceImpl.java 932fe66527 买n送一活动 4 anni fa
PickUpCodeServiceImpl.java 537714ea26 支付凭证回传,商品详情主图 3 anni fa
PinganPayOrderServiceImpl.java a1d2220945 kmall-pt-general 提交 5 anni fa
PinganResponseServiceImpl.java a1d2220945 kmall-pt-general 提交 5 anni fa
ProductServiceImpl.java a1d2220945 kmall-pt-general 提交 5 anni fa
ProductStoreRelaServiceImpl.java edbf69a606 bug修复 3 anni fa
RealtimeSalesDetectionServiceImpl.java d33b47a80b Revert "Revert "update"" 4 anni fa
RelatedGoodsServiceImpl.java a1d2220945 kmall-pt-general 提交 5 anni fa
SaleRecordServiceImpl.java 2f736afcdb 新增库对应的结构(dao、service、controller、entity、html、js) 4 anni fa
SalesDataUploadServiceImpl.java 0f2854b0d8 1.销售数据上传增加上传数据;2.销售数据下载增加ip;3.增加大屏幕取货码页面不显示已提货取货码;4.优化查询订单取货码页面 4 anni fa
SalesDetailServiceImpl.java 5d10fc0122 订单数据接口 3 anni fa
SearchHistoryServiceImpl.java a1d2220945 kmall-pt-general 提交 5 anni fa
ShippingServiceImpl.java a1d2220945 kmall-pt-general 提交 5 anni fa
SpecificationServiceImpl.java a1d2220945 kmall-pt-general 提交 5 anni fa
StoreMngChangeServiceImpl.java a1d2220945 kmall-pt-general 提交 5 anni fa
StoreServiceImpl.java 058def0cd6 小票打印、收发货地址、系统日志以及小票颜色变更逻辑等 3 anni fa
StoreSmsConfigServiceImpl.java 666af5c1cb xwh增加门店短信配置功能 4 anni fa
StoreTransferInventoryOrderDetailServiceImpl.java 52974834d8 门店库存转移 4 anni fa
StoreTransferInventoryOrderServiceImpl.java 069da6bf68 1.注释掉发送短信 4 anni fa
SupplierServiceImpl.java 4e0c59376a 修复页面bug 3 anni fa
SysBizPermissionServiceImpl.java 9784be32fb [lsp]1.新增用户业务权限功能 4 anni fa
SysCusNationCodeServiceImpl.java 0738b1fcd6 修复国别代码错误 3 anni fa
SysCusUnitCodeServiceImpl.java 56a333436a 增加计量单位代码导入 3 anni fa
SysDeptServiceImpl.java a1d2220945 kmall-pt-general 提交 5 anni fa
SysMacroServiceImpl.java c0dc4b2ab3 积分规则设置1116 3 anni fa
SysNoticeServiceImpl.java b9dcc717c5 提交代码解决冲突 4 anni fa
SysNoticeUserServiceImpl.java a1d2220945 kmall-pt-general 提交 5 anni fa
SysOssServiceImpl.java a1d2220945 kmall-pt-general 提交 5 anni fa
SysPrinterServiceImpl.java a1d2220945 kmall-pt-general 提交 5 anni fa
SysRegionServiceImpl.java a1d2220945 kmall-pt-general 提交 5 anni fa
SysUserBizPermissionServiceImpl.java 9784be32fb [lsp]1.新增用户业务权限功能 4 anni fa
TaxErrorRecordServiceImpl.java 6f136e18fb 1.税费计算修改 4 anni fa
ThirdMerchExpressServiceImpl.java a1d2220945 kmall-pt-general 提交 5 anni fa
ThirdMerchantBizServiceImpl.java a1d2220945 kmall-pt-general 提交 5 anni fa
TopicCategoryServiceImpl.java a1d2220945 kmall-pt-general 提交 5 anni fa
TopicServiceImpl.java a1d2220945 kmall-pt-general 提交 5 anni fa
UserCouponServiceImpl.java a1d2220945 kmall-pt-general 提交 5 anni fa
UserLevelServiceImpl.java a1d2220945 kmall-pt-general 提交 5 anni fa
UserServiceImpl.java 538a4a4560 fix:积分分摊bug 3 anni fa