fix: download

internal/cron/task.go

@@ -544,6 +544,25 @@ func skuChange() {
 			if err := tx.Model(&gsk).Updates(p1).Error; err != nil {
 				return err
 			}
+			if p1["inventory"] == 0 {
+				var other []goods2.RecookGoodsSkuModel
+				tx.Find(&other, "goods_id = ?", gsk.Id)
+				if len(other) == 0 {
+					return nil
+				}
+				flag := 1
+				for _, v := range other {
+					if v.Inventory != 0 {
+						flag = 0
+						break
+					}
+				}
+				if flag == 1 {
+					tx.Table((&goods2.RecookGoodsInfoModel{}).TableName()).
+						Where("id = ?", gsk.GoodsId).
+						Update("publish_status", 0)
+				}
+			}
 			//if err := tx.Table((&goods2.RecookGoodsSkuModel{}).TableName()).Where("id = ?", gsk.Id).
 			//	Update("pic_url", patch.SkuDetailBase.MainPhoto).Error; err != nil {
 			//	return err

internal/v2/logic/manage/order/order.go

@@ -495,7 +495,7 @@ func (o *orderLogic) Query(where Where) (list []QueryDownload, e error) {
 		Joins("JOIN recook_order_addr AS addr ON addr.order_id = rog.order_id").
 		Joins("JOIN recook_user_info AS ru ON ru.id = rog.user_id").
 		Joins("LEFT JOIN gys_goods_info AS ggi ON rgi.id = ggi.main_goods_id").
-		Joins("LEFT JOIN (SELECT * FROM recook_order_goods_express GROUP BY order_goods_id) AS express ON express.order_goods_id = rog.id").
+		Joins("LEFT JOIN (SELECT * FROM recook_order_goods_express) AS express ON express.order_goods_id = rog.id").
 		Where("rog.pay_status = ?", manage.RecookOrderGoodsDetailPayStatusSuc)
 	query = query.Where("rog.shipping_method = ? AND is_split = 0", manage.RecookOrderGoodsDetailShippingMethodExpress)
 	{