Merge remote-tracking branch 'origin/master'

rule/relate_commission.go

@@ -273,7 +273,9 @@ func BatchGetCommissionByOrder(engine *xorm.Engine, dbName string, CommissionPar
 			if param.Oid == "" {
 				return errors.New("订单缺失")
 			}
-			param.CommissionParam.OldPrice = param.CommissionParam.GoodsPrice
+			if zhios_order_relate_utils.StrToFloat64(param.CommissionParam.GoodsPrice) > 0 {
+				param.CommissionParam.OldPrice = param.CommissionParam.GoodsPrice
+			}
 			param.CommissionParam.Oid = param.Oid
 
 			profit, pvdFee, sysFee, subsidyFee, lvUser, err := svc.GetRewardCommission(engine, &param.CommissionParam, isShare, param.Uid, param.Provider, dbName, isAllLevelReturn, map[string]string{}, commArr, plan, commission, virtualCoinMoneyRate)