Merge branch 'dev' of http://gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway into dev

@@ -7,6 +7,10 @@ import (
 
 type UpdateDictionaryCommand struct {
 	//操作人
-	Operator domain.Operator `json:"-"`
-	allied_creation_basic.ReqDictionaryUpdate
+	Operator     domain.Operator                        `json:"-"`
+	DictionaryId int64                                  `json:"-"`         // 字典编号 主键
+	DictCode     string                                 `json:"dictCode"`  // 字典编码
+	DictName     string                                 `json:"dictName"`  // 字典名称
+	Describe     string                                 `json:"describe"`  // 备注信息
+	DictItems    []allied_creation_basic.DictionaryItem `json:"dictItems"` // 字典值列表
 }

@@ -27,10 +27,11 @@ func ToDividendsEstimateDividendItem(param *allied_creation_cooperation.DataDivi
 			CustomerName:              v.CustomerName,
 			DividendsIncentivesAmount: v.OrderAmount,
 			OrderOrReturnedOrderNum:   v.OrderNumber,
-			OrderTime:                 v.OrderDate.UnixNano() / 1e6,
-			OriginalOrderNum:          v.OriginalOrderNum,
-			RegionName:                v.RegionName,
+
+			OriginalOrderNum: v.OriginalOrderNum,
+			RegionName:       v.RegionName,
 		}
+		item.OrderTime = v.OrderDate.UnixNano() / 1e6
 		listdata = append(listdata, item)
 	}
 

@@ -44,7 +44,7 @@ func (gateway HttplibAlliedCreationCooperation) DividendsOrderAdd(param ReqDivid
 
 // DividendsOrderUpdate 更新分红订单
 func (gateway HttplibAlliedCreationCooperation) DividendsOrderUpdate(param ReqDividendsOrderUpdate) (*DataDividendsOrderUpdate, error) {
-	param.SalesmanUid = "1" //TODO 调试用删除
+
 	url := gateway.baseUrL + "/dividends-orders/" + strconv.Itoa(param.DividendsOrderId)
 	method := "PUT"
 	req := gateway.CreateRequest(url, method)

@@ -31,7 +31,7 @@ func (controller *DictionaryController) UpdateDictionary() {
 	if err != nil {
 		log.Logger.Debug("json err:" + err.Error())
 	}
-	dictionaryId, _ := controller.GetInt64("::dictionaryId")
+	dictionaryId, _ := controller.GetInt64(":dictionaryId")
 	updateCommand.Operator = controller.GetOperator()
 	updateCommand.DictionaryId = dictionaryId
 	data, err := dictionaryService.UpdateDictionay(updateCommand)
@@ -54,7 +54,7 @@ func (controller *DictionaryController) GetDictionary() {
 	dictionaryService := service.NewDictionayService(nil)
 	getQuery := &query.GetDictionaryQuery{}
 
-	dictionaryId, _ := controller.GetInt64("::dictionaryId")
+	dictionaryId, _ := controller.GetInt64(":dictionaryId")
 	getQuery.DictionaryId = int(dictionaryId)
 	getQuery.Operator = controller.GetOperator()
 	data, err := dictionaryService.GetDictionay(getQuery)

@@ -135,7 +135,7 @@ func (controller ExcelDataController) ImportDividendsOrder() {
 	for _, v := range excelData {
 		if allEmpty := controller.fieldValueAllEmpty(v); allEmpty {
 			//以全字段空跳过
-			continue
+			break
 		}
 		//TODO 按需转化
 		item := allied_creation_cooperation.ImportDividendsOrderData{
@@ -200,7 +200,7 @@ func (controller ExcelDataController) ImportDividendsReturnedOrder() {
 	for _, v := range excelData {
 		if allEmpty := controller.fieldValueAllEmpty(v); allEmpty {
 			//以全字段空跳过
-			continue
+			break
 		}
 		//TODO 按需转化
 		item := allied_creation_cooperation.ImportDividendsReturnedOrderData{