Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev

bin/json/game_buriedcondi.json

@@ -18117,14 +18117,14 @@
     "type_sp": 1,
     "tasktxt": {
       "key": "buried_buried_condi_tasktxt_774",
-      "text": "冒险3-4通关"
+      "text": "冒险5-4通关"
     },
     "type": 61,
     "valid": 0,
     "NPC": 10484,
     "value": 1,
     "filter": [
-      1100304
+      1100504
     ],
     "filter2": [
       "关卡ID",
@@ -18166,14 +18166,14 @@
     "type_sp": 1,
     "tasktxt": {
       "key": "buried_buried_condi_tasktxt_776",
-      "text": "冒险3-8通关"
+      "text": "冒险5-8通关"
     },
     "type": 61,
     "valid": 0,
     "NPC": 10504,
     "value": 1,
     "filter": [
-      1100308
+      1100508
     ],
     "filter2": [
       "关卡ID",
@@ -18477,14 +18477,14 @@
     "type_sp": 1,
     "tasktxt": {
       "key": "buried_buried_condi_tasktxt_789",
-      "text": "冒险4-8通关"
+      "text": "冒险6-8通关"
     },
     "type": 61,
     "valid": 0,
     "NPC": 10634,
     "value": 1,
     "filter": [
-      1100408
+      1100608
     ],
     "filter2": [
       "关卡ID",
@@ -18596,14 +18596,14 @@
     "type_sp": 1,
     "tasktxt": {
       "key": "buried_buried_condi_tasktxt_794",
-      "text": "冒险5-8通关"
+      "text": "冒险7-8通关"
     },
     "type": 61,
     "valid": 0,
     "NPC": 10684,
     "value": 1,
     "filter": [
-      1100508
+      1100708
     ],
     "filter2": [
       "关卡ID",
@@ -18809,14 +18809,14 @@
     "type_sp": 1,
     "tasktxt": {
       "key": "buried_buried_condi_tasktxt_803",
-      "text": "冒险6-6通关"
+      "text": "冒险8-8通关"
     },
     "type": 61,
     "valid": 0,
     "NPC": 10774,
     "value": 1,
     "filter": [
-      1100606
+      1100808
     ],
     "filter2": [
       "关卡ID",
@@ -18926,14 +18926,14 @@
     "type_sp": 1,
     "tasktxt": {
       "key": "buried_buried_condi_tasktxt_808",
-      "text": "冒险7-6通关"
+      "text": "冒险9-8通关"
     },
     "type": 61,
     "valid": 0,
     "NPC": 10824,
     "value": 1,
     "filter": [
-      1100706
+      1100908
     ],
     "filter2": [
       "关卡ID",
@@ -18998,14 +18998,14 @@
     "type_sp": 1,
     "tasktxt": {
       "key": "buried_buried_condi_tasktxt_811",
-      "text": "冒险8-6通关"
+      "text": "冒险10-8通关"
     },
     "type": 61,
     "valid": 0,
     "NPC": 10854,
     "value": 1,
     "filter": [
-      1100806
+      1101008
     ],
     "filter2": [
       "关卡ID",
@@ -19071,14 +19071,14 @@
     "type_sp": 1,
     "tasktxt": {
       "key": "buried_buried_condi_tasktxt_814",
-      "text": "冒险9-6通关"
+      "text": "冒险11-8通关"
     },
     "type": 61,
     "valid": 0,
     "NPC": 10884,
     "value": 1,
     "filter": [
-      1100906
+      1101108
     ],
     "filter2": [
       "关卡ID",
@@ -19117,14 +19117,14 @@
     "type_sp": 1,
     "tasktxt": {
       "key": "buried_buried_condi_tasktxt_816",
-      "text": "冒险10-6通关"
+      "text": "冒险12-3通关"
     },
     "type": 61,
     "valid": 0,
     "NPC": 10904,
     "value": 1,
     "filter": [
-      1101006
+      1200103
     ],
     "filter2": [
       "关卡ID",
@@ -19190,14 +19190,14 @@
     "type_sp": 1,
     "tasktxt": {
       "key": "buried_buried_condi_tasktxt_819",
-      "text": "冒险11-6通关"
+      "text": "冒险12-6通关"
     },
     "type": 61,
     "valid": 0,
     "NPC": 10934,
     "value": 1,
     "filter": [
-      1101106
+      1101206
     ],
     "filter2": [
       "关卡ID",
@@ -19236,14 +19236,14 @@
     "type_sp": 1,
     "tasktxt": {
       "key": "buried_buried_condi_tasktxt_821",
-      "text": "冒险12-6通关"
+      "text": "冒险12-8通关"
     },
     "type": 61,
     "valid": 0,
     "NPC": 10954,
     "value": 1,
     "filter": [
-      1101206
+      1101208
     ],
     "filter2": [
       "关卡ID",

modules/smithy/api_trade.go

@@ -1,6 +1,7 @@
 package smithy
 
 import (
+	"errors"
 	"go_dreamfactory/comm"
 	"go_dreamfactory/pb"
 )
@@ -28,11 +29,21 @@ func (this *apiComp) Sell(session comm.IUserSession, req *pb.SmithySellReq) (err
 
 	cus, err := this.module.modelTrade.updateCustomer(session.GetUserId(), req.CustomerId)
 	if err != nil {
-		errdata = &pb.ErrorData{
-			Code:    pb.ErrorCode_ReqParameterError,
-			Title:   pb.ErrorCode_ReqParameterError.ToString(),
-			Message: err.Error(),
+		var customErr = new(comm.CustomError)
+		if errors.As(err, &customErr) {
+			errdata = &pb.ErrorData{
+				Code:    customErr.Code,
+				Title:   customErr.Code.ToString(),
+				Message: err.Error(),
+			}
+		} else {
+			errdata = &pb.ErrorData{
+				Code:    pb.ErrorCode_DBError,
+				Title:   pb.ErrorCode_DBError.ToString(),
+				Message: err.Error(),
+			}
 		}
+
 		return
 	}
 

modules/smithy/model_trade.go

@@ -147,7 +147,7 @@ func (s *modelTrade) updateCustomer(uid string, customerId int32) (*pb.DBCustome
 		})
 		cus.LastRefreshTime = configure.Now().Unix()
 		update := map[string]interface{}{
-			"customerIds":     cus.Customers,
+			"customers":       cus.Customers,
 			"total":           cus.Total,
 			"lastRefreshTime": cus.LastRefreshTime,
 		}