liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'jdshop' of e.coding.net:rosydev/jx-callback into jdshop

Browse Source
This commit is contained in:
邹宗楠
2023-10-16 15:36:28 +08:00
parent ce24432eb7 fbb2ec01c6
commit d337de65af
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
business/partner/purchase/mtwm/act.go
View File

@@ -296,12 +296,13 @@ func GetActByAppPoiCode(vendorStoreID, vendorOrgCode string, sTime, eTime int64,
//获取活动商品 //获取活动商品
for _, v := range actInfo { for _, v := range actInfo {
sku, err := a.FullDiscountFoodsList(vendorStoreID, v.ActInfo.ActIDs) sku, err := a.FullDiscountFoodsList(vendorStoreID, v.ActInfo.ActIDs)
actID := utils.Str2Int(v.ActInfo.ActIDs) //actID := utils.Str2Int(v.ActInfo.ActIDs)
if err != nil { if err != nil || sku == nil {
temp[actID] = nil temp = append(temp, actInfo)
} }
if CheckActTime(sTime, eTime, v.ActInfo.StartTime, v.ActInfo.EndTime) { if CheckActTime(sTime, eTime, v.ActInfo.StartTime, v.ActInfo.EndTime) {
temp[actID] = sku temp = append(temp, sku)
//temp[actID] = sku
} }
} }
resp[ActTypeDeduction] = temp resp[ActTypeDeduction] = temp
@@ -338,8 +339,4 @@ func CheckActTime(startTime, endTime, sTime, eTime int64) bool {
return false return false
} }
return true return true
//if (startTime <= eTime && eTime <= endTime) || (startTime <= sTime && sTime <= endTime) {
// return true
//}
//return false
} }