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

aa

Browse Source
This commit is contained in:
苏尹岚
2021-03-19 18:35:10 +08:00
parent 2d3cecd1da
commit 51837e2f15
2 changed files with 47 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
business/jxstore/tempop/tempop.go
View File

@@ -14,7 +14,6 @@ import (
"github.com/qiniu/api.v7/storage"
"git.rosy.net.cn/baseapi/platformapi/jdapi"
"git.rosy.net.cn/baseapi/platformapi/jdshopapi"
"git.rosy.net.cn/baseapi/platformapi/mtwmapi"
"git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/baseapi/utils/errlist"
@@ -1753,14 +1752,16 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) {
)
sql := `
SELECT * from store_map where vendor_id = 5 and deleted_at = '1970-01-01 00:00:00' and vendor_org_code = 2
AND store_id = 100117
`
dao.GetRows(db, &storeMaps, sql, nil)
// for _, v := range storeMaps {
task := tasksch.NewParallelTask("uuuuu", tasksch.NewParallelConfig().SetParallelCount(20).SetIsContinueWhenError(true), ctx,
func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
v := batchItemList[0].(*model.StoreMap)
detail, _ := api.JdShop2API.ShopDetail(utils.Str2Int(v.VendorStoreID))
storeDetail, _ := dao.GetStoreDetail(db, v.StoreID, model.VendorIDJDShop, "2")
// detail, _ := api.JdShop2API.ShopDetail(utils.Str2Int(v.VendorStoreID))
// storeDetail, _ := dao.GetStoreDetail(db, v.StoreID, model.VendorIDJDShop, "2")
api.JdShop2API.UpdateExpand(utils.Str2Int(v.VendorStoreID))
// var (
// url2 string
// idCode string
@@ -1792,48 +1793,48 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) {
// if !strings.Contains(ex, "00:00:00") {
// ex += " 00:00:00"
// }
api.JdShop2API.UpdateBasic(&jdshopapi.UpdateBasicParam{
StoreID: detail.StoreID,
StoreName: detail.StoreName,
CategoryID2: detail.CategoryID2,
Coordinate: detail.Coordinate,
BussinessBeginTime: detail.BussinessBeginTime,
BussinessEndTime: detail.BussinessEndTime,
ImgURL: detail.ImgURL,
StorePhone: detail.StorePhone,
AddName: detail.AddName,
AddCode1: detail.AddCode1,
AddCode2: detail.AddCode2,
AddCode3: detail.AddCode3,
CategoryID1: detail.CategoryID1,
QualificationRequests: []*jdshopapi.QualificationRequests{
&jdshopapi.QualificationRequests{
QualificationID: 41,
QualificationName: "营业执照",
QualificationNo: detail.QualificationInfoTOList[0].QualificationNo,
QualificationURL: detail.QualificationInfoTOList[0].QualificationURL,
QualificationBusType: 2,
QualificationBusName: storeDetail.LicenceCorpName,
StartTime: detail.QualificationInfoTOList[0].StartTime,
EndingTime: utils.Time2Str(utils.Str2Time(detail.QualificationInfoTOList[0].StartTime).AddDate(10, 0, 0)),
Time: []string{detail.QualificationInfoTOList[0].StartTime, detail.QualificationInfoTOList[0].EndingTime},
},
&jdshopapi.QualificationRequests{
QualificationID: 42,
QualificationName: "身份证件",
QualificationNo: detail.QualificationInfoTOList[1].QualificationNo,
QualificationURL: detail.QualificationInfoTOList[1].QualificationURL,
StartTime: detail.QualificationInfoTOList[1].StartTime,
EndingTime: detail.QualificationInfoTOList[1].EndingTime,
Time: []string{detail.QualificationInfoTOList[1].StartTime, detail.QualificationInfoTOList[1].EndingTime},
// QualificationNo: idCode,
// QualificationURL: url2,
// StartTime: startTime,
// EndingTime: ex,
// Time: []string{startTime, ex},
},
},
})
// api.JdShop2API.UpdateBasic(&jdshopapi.UpdateBasicParam{
// StoreID: detail.StoreID,
// StoreName: detail.StoreName,
// CategoryID2: detail.CategoryID2,
// Coordinate: detail.Coordinate,
// BussinessBeginTime: detail.BussinessBeginTime,
// BussinessEndTime: detail.BussinessEndTime,
// ImgURL: detail.ImgURL,
// StorePhone: detail.StorePhone,
// AddName: detail.AddName,
// AddCode1: detail.AddCode1,
// AddCode2: detail.AddCode2,
// AddCode3: detail.AddCode3,
// CategoryID1: detail.CategoryID1,
// QualificationRequests: []*jdshopapi.QualificationRequests{
// &jdshopapi.QualificationRequests{
// QualificationID: 41,
// QualificationName: "营业执照",
// QualificationNo: detail.QualificationInfoTOList[0].QualificationNo,
// QualificationURL: detail.QualificationInfoTOList[0].QualificationURL,
// QualificationBusType: 2,
// QualificationBusName: storeDetail.LicenceCorpName,
// StartTime: detail.QualificationInfoTOList[0].StartTime,
// EndingTime: utils.Time2Str(utils.Str2Time(detail.QualificationInfoTOList[0].StartTime).AddDate(10, 0, 0)),
// Time: []string{detail.QualificationInfoTOList[0].StartTime, detail.QualificationInfoTOList[0].EndingTime},
// },
// &jdshopapi.QualificationRequests{
// QualificationID: 42,
// QualificationName: "身份证件",
// QualificationNo: detail.QualificationInfoTOList[1].QualificationNo,
// QualificationURL: detail.QualificationInfoTOList[1].QualificationURL,
// StartTime: detail.QualificationInfoTOList[1].StartTime,
// EndingTime: detail.QualificationInfoTOList[1].EndingTime,
// Time: []string{detail.QualificationInfoTOList[1].StartTime, detail.QualificationInfoTOList[1].EndingTime},
// QualificationNo: idCode,
// QualificationURL: url2,
// StartTime: startTime,
// EndingTime: ex,
// Time: []string{startTime, ex},
// },
// },
// })
return retVal, err
}, storeMaps)
tasksch.HandleTask(task, nil, true).Run()

2
business/model/dao/report.go
View File

@@ -87,7 +87,7 @@ func GetStatisticsReportForOrders(db *DaoDB, storeIDs, vendorIDs []int, fromDate
SELECT ss.*,
ss.earning_price1 - IFNULL(ss.afs_shop_price,0) earning_price,
ss.total_shop_money1 - IFNULL(ss.afs_total_money,0) total_shop_money,
ss.total_gross_profit1 + IFNULL(ss.afs_shop_price,0) - IFNULL(ss.afs_total_money,0)-ss.order_counts*0.8*100 total_gross_profit
ss.total_gross_profit1 + IFNULL(ss.afs_shop_price,0) - IFNULL(ss.afs_total_money,0) - ss.order_counts*0.8*100 total_gross_profit
FROM (
SELECT
IF(a.jx_store_id <> 0,a.jx_store_id,a.store_id) store_id,