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

business/model/dao/dao_order.go

@@ -2,6 +2,7 @@ package dao
 
 import (
 	"fmt"
+	"git.rosy.net.cn/jx-callback/globals"
 	"regexp"
 	"strconv"
 	"time"
@@ -892,7 +893,7 @@ func GetOrders(db *DaoDB, ids []int64, isIncludeSku, isIncludeFake bool, fromDat
 	sql := fmt.Sprintf(`
 	SELECT SQL_CALC_FOUND_ROWS a.* FROM (
 	SELECT 
-	DISTINCT t1.*,
+	 t1.*,
 	-- CAST(IF(t1.earning_price <> 0, t1.earning_price, IF(t1.shop_price <> 0 && t1.shop_price < t1.sale_price, t1.shop_price, t1.sale_price) * IF(t1.order_pay_percentage > 0, t1.order_pay_percentage, %d) / 100) AS SIGNED) earning_price,
 	t2.status waybill_status, t2.courier_name, t2.courier_mobile,
 	t2.actual_fee, t2.desired_fee,t2.punctual_fee, t2.waybill_created_at, t2.waybill_finished_at, t2.vendor_waybill_id2 vendor_waybill_id2_waybill,
@@ -1155,6 +1156,8 @@ func GetOrders(db *DaoDB, ids []int64, isIncludeSku, isIncludeFake bool, fromDat
 	sqlParams = append(sqlParams, pageSize, offset)
 	txDB, _ := Begin(db)
 	defer Commit(db, txDB)
+	globals.SugarLogger.Debugf("===============sql2 := %s", sql)
+	globals.SugarLogger.Debugf("===============sql2 := %s", utils.Format4Output(sqlParams, false))
 	if err = GetRowsTx(txDB, &orders, sql, sqlParams...); err == nil {
 		totalCount = GetLastTotalRowCount2(db, txDB)
 	}

controllers/taobao_vegetable.go

@@ -146,11 +146,11 @@ func (c *TaoBaoVegetableController) ApplyCancelOrder() {
 		c.Data["json"] = tao_vegetable.CallBackResultSign(fmt.Errorf("非法签名"))
 		c.ServeJSON()
 		return
-	} /*else {
+	} else {
 		c.Data["json"] = tao_vegetable.CallBackResultSign(nil)
 		c.ServeJSON()
 		return
-	}*/
+	}
 
 	callbackResponse := taoVegetable.OnCallbackMsg(tao_vegetable.OrderStatusApplyAfs, afsOrder.OutOrderId, afsOrder)
 	c.Data["json"] = callbackResponse