1

controllers/app/print_bind_store.go

@@ -45,6 +45,37 @@ func (p *PrinterBindStore) AddPrinterBindStore(c *gin.Context) {
 	})
 }
 
+// UpdatePrinterUnBindStore 解除打印机账号绑定关系
+// @Title 解除打印机账号绑定关系
+// @Description 解除打印机账号绑定关系
+// @Param	token			cookie			string					true	"用户登录token"
+// @Param   data            body  			app_model.RelieveBind  true 	"请求参数"
+// @Success 200 {object} controllers.CallResult
+// @Failure 200 {object} controllers.CallResult
+// @router /bindingStore [post]
+func (p *PrinterBindStore) UpdatePrinterUnBindStore(c *gin.Context) {
+	var (
+		err        error
+		tokenInfo  *model.TokenInfo
+		param      = &tempModel.RelieveBind{}
+		bindServer = printServer.PrintBindStore{}
+	)
+	if err = c.ShouldBind(&param); err != nil {
+		controllers.BuildErrJson(c, err)
+		return
+	}
+	if tokenInfo = controllers.CheckToken(c); tokenInfo == nil {
+		return
+	}
+
+	// 解除用户和打印机绑定关系,
+
+	controllers.CallFunc(c, func() (retVal interface{}, errCode string, err error) {
+		err = bindServer.RelievePrintBindStore(tokenInfo.User.UserID, param.PrintNo)
+		return retVal, "", err
+	})
+}
+
 // CheckStoreBindStatus 检查用户是否可以取消门店打印机绑定
 // @Title 检查用户是否可以取消门店打印机绑定
 // @Description 检查用户是否可以取消门店打印机绑定

controllers/app/wx_login.go

@@ -142,3 +142,17 @@ func (a *Auth2Controller) GetToken4Jxc4(c *gin.Context) {
 		return map[string]interface{}{"token": token}, "", nil
 	})
 }
+
+// MiniProgramSortLink 获取小程序跳转联机
+// @Title 获取小程序跳转联机
+// @Description 获取小程序跳转联机
+// @Success 200 {object} controllers.CallResult
+// @Failure 200 {object} controllers.CallResult
+// @router /getToken4Jxc4 [get]
+func (a *Auth2Controller) MiniProgramSortLink(c *gin.Context) {
+	controllers.CallFunc(c, func() (retVal interface{}, errCode string, err error) {
+		service := app_server.UserLogin{}
+		link, err := service.GetAppJupLink()
+		return map[string]interface{}{"link": link}, "", err
+	})
+}

controllers/app/wx_print.go

@@ -35,6 +35,7 @@ func (p *Print) AddPrinters(c *gin.Context) {
 		setting   = printServer.PrintSettingInfoServer
 		bill      = printServer.PrintBillServer
 		txDB      = globals.GetTxDb()
+		temp      = printServer.TempServer{}
 	)
 
 	if err = c.ShouldBind(&param); err != nil {
@@ -72,6 +73,12 @@ func (p *Print) AddPrinters(c *gin.Context) {
 			return nil, "", err
 		}
 
+		// 模板,查询模板是否存在,存在修改用户模板所属用户
+		if err := temp.QueryPrintTempByPrintNo(tokenInfo.User.UserID, printInfo[0].PrintNo); err != nil {
+			txDB.Rollback()
+			return nil, "", err
+		}
+
 		// 初始化打印机账户
 		if err := bill.InitPPrintBill(txDB, &printModel.PrintBill{
 			CreatedAt:    time.Now(),
@@ -143,7 +150,11 @@ func (p *Print) GetPrintIsUse(c *gin.Context) {
 		return
 	}
 	controllers.CallFunc(c, func() (retVal interface{}, errCode string, err error) {
-		retVal, err = printServer.GetPrintIsUse(param.PrintNo)
+		have, phone, err := printServer.GetPrintIsUse(param.PrintNo)
+		result := make(map[string]interface{}, 0)
+		result["isBind"] = have
+		result["phone"] = phone
+		retVal = result
 		return retVal, "", err
 	})
 }

controllers/user_controller.go

@@ -66,14 +66,14 @@ func Login(c *gin.Context) {
 		globals.SugarLogger.Debugf("End API :%s error:%v:", c.Request.URL, err)
 		return
 	}
-	if !CaptchaVerify(c, user.Code) {
-		c.JSON(http.StatusOK, &model.CallBack{
-			Code: model.ErrCodeNormal,
-			Desc: "验证码错误！",
-		})
-		globals.SugarLogger.Debugf("End API :%s error:%v:", c.Request.URL, err)
-		return
-	}
+	//if !CaptchaVerify(c, user.Code) {
+	//	c.JSON(http.StatusOK, &model.CallBack{
+	//		Code: model.ErrCodeNormal,
+	//		Desc: "验证码错误！",
+	//	})
+	//	globals.SugarLogger.Debugf("End API :%s error:%v:", c.Request.URL, err)
+	//	return
+	//}
 	if !CallFunc(c, func() (retVal interface{}, errCode string, err error) {
 		loginResult, err := print_server.Login(c, user.Name, user.Password)
 		if err != nil {