Merge branch 'dev2.3.12' of http://192.168.3.207:8080/group3/qmx_admin into dev2.3.12

src/customerService/customController.go

@@ -43,7 +43,7 @@ func CustomSendMsg(context *admin.Context) (interface{}, error) {
 	}, err
 }
 
-func MycustomerList(context *admin.Context) (interface{}, error) {
+func MyCustomerList(context *admin.Context) (interface{}, error) {
 	param := new(struct {
 		State           string `form:"state"`           //客户状态
 		UpdateTimeStart string `form:"updateTimeStart"` //最近更新时间筛选开始时间

src/customerService/customService.go

@@ -83,6 +83,7 @@ func CustomSendMsgService(param *customMsg, sendStatus int, loginUserName string
 			"link":        param.Link,
 			"isdel":       1,
 			"send_userid": loginUserId,
+			"send_name":   loginUserName,
 		})
 		msgLogId = strconv.FormatInt(msgId, 10)
 		//如果是定时发送

src/customerService/newsService.go

@@ -596,6 +596,7 @@ func SendMsg(param *Message, sendStatus int, loginUserName string, loginUserId i
 			"link":        param.Link,
 			"isdel":       1,
 			"send_userid": loginUserId,
+			"send_name":   loginUserName,
 		})
 		msgLogId = strconv.FormatInt(msgId, 10)
 		//如果是定时发送

src/order/otherOrderController.go

@@ -805,7 +805,7 @@ func CreateVipOrder(context *admin.Context) (interface{}, error) {
 	code := fmt.Sprintf("%s%s", time.Now().Format("150405"), qutil.GetRandom(6))
 	//param.OrderMoney = param.ContractMoney
 	param.DisCountPrice = param.ContractMoney
-	param.Badge = ""
+	param.Badge = "give"
 	param.ChargeMode = 0
 	param.ProceduresMoney = "0"
 	param.OrderChannel = "xdqd02"

src/order/otherOrderService.go

@@ -63,7 +63,7 @@ func createOtherOrder(param *CreateOtherOrderParams, code string) bool {
 			"pNum":      packDetail.PackNum,
 			"validYear": packDetail.ValidYear,
 			"price":     packDetail.Price,
-			"badge":     "",
+			"badge":     "give",
 		}
 		price = packDetail.Price
 		packNum = packDetail.PackNum
@@ -452,19 +452,19 @@ func createVipOrder(param *CreateOtherOrderParams, code string) (bool, string) {
 		if param.DisCountPrice != 0 {
 			insertData["discount_price"] = param.DisCountPrice
 		}
-		if param.Badge != "" {
-			insertData["original_price"] = param.DisCountPrice
-			insertData["return_status"] = 1
-		}
 		if param.VipType == 1 {
 			insertData["vip_type"] = 1
 		} else if param.VipType == 2 {
 			insertData["vip_type"] = 2
 			insertData["vip_starttime"] = vst
 			insertData["vip_endtime"] = vet
-			//delete(insertData,"vip_starttime")
-			//delete(insertData,"vip_endtime")
 		}
+		if param.Badge != "" {
+			insertData["original_price"] = param.DisCountPrice
+			insertData["return_status"] = 1
+			insertData["vip_type"] = 0
+		}
+
 		contractData := map[string]interface{}{
 			"order_code":        code,
 			"customer_name":     param.CustomerName,