合并分支 'dev' 到 'test'

fix:增加修改手机号判断



查看合并请求 !16

@@ -286,15 +286,29 @@ func (unifiedUserCenterService *UnifiedUserCenterService) SyncEmployeeCallback(s
 			break
 			break
 		case "changePhoneAllCompany": // 修改手机号
 		case "changePhoneAllCompany": // 修改手机号
 			// 修改用户数据
 			// 修改用户数据
+			if ok, err := employeeDao.EmployeeExist(oldPhone); err != nil {
+				return false, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
+			} else {
+				if ok {
 					err := employeeDao.ChangePhone(oldPhone, newPhone)
 					err := employeeDao.ChangePhone(oldPhone, newPhone)
 					if err != nil {
 					if err != nil {
 						return false, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
 						return false, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
 					}
 					}
+				}
+			}
+
 			// 修改业务数据-素币兑换清单
 			// 修改业务数据-素币兑换清单
+			if ok, err := cashPoolDao.ExchangeCashPersonListExist(oldPhone); err != nil {
+				return false, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
+			} else {
+				if ok {
 					errUpdateExchangeCashPersonList := cashPoolDao.UpdateExchangeCashPersonListUserInfo(oldPhone, newPhone)
 					errUpdateExchangeCashPersonList := cashPoolDao.UpdateExchangeCashPersonListUserInfo(oldPhone, newPhone)
 					if errUpdateExchangeCashPersonList != nil {
 					if errUpdateExchangeCashPersonList != nil {
 						return false, application.ThrowError(application.TRANSACTION_ERROR, errUpdateExchangeCashPersonList.Error())
 						return false, application.ThrowError(application.TRANSACTION_ERROR, errUpdateExchangeCashPersonList.Error())
 					}
 					}
+				}
+			}
+
 			// 发布修改手机号事件
 			// 发布修改手机号事件
 			if err := changePhoneService.ChangePhone(oldPhone, newPhone); err != nil {
 			if err := changePhoneService.ChangePhone(oldPhone, newPhone); err != nil {
 				return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
 				return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())

@@ -35,10 +35,19 @@ func (dao *CashPoolDao) CalculateActivityExchangedSuMoney(activityId int64) (map
 	}, nil
 	}, nil
 }
 }
 
 
+// ExchangeCashPersonListExist 判断素币兑换清单是否存在
+func (dao *CashPoolDao) ExchangeCashPersonListExist(oldPhone string) (bool, error) {
+	tx := dao.transactionContext.PgTx
+	m := models.ExchangeCashPersonList{}
+	query := tx.Model(&m).Where("employee_account=?", oldPhone)
+	ok, err := query.Exists()
+	return ok, err
+}
+
 // UpdateExchangeCashPersonListUserInfo 更新素币兑换清单用户信息
 // UpdateExchangeCashPersonListUserInfo 更新素币兑换清单用户信息
 func (dao *CashPoolDao) UpdateExchangeCashPersonListUserInfo(oldPhone string, newPhone string) error {
 func (dao *CashPoolDao) UpdateExchangeCashPersonListUserInfo(oldPhone string, newPhone string) error {
 	tx := dao.transactionContext.PgTx
 	tx := dao.transactionContext.PgTx
-	if _, err := tx.QueryOne(
+	if _, err := tx.Query(
 		pg.Scan(),
 		pg.Scan(),
 		"UPDATE exchange_cash_person_lists SET employee_account = ? WHERE employee_account = ?",
 		"UPDATE exchange_cash_person_lists SET employee_account = ? WHERE employee_account = ?",
 		newPhone, oldPhone); err != nil {
 		newPhone, oldPhone); err != nil {

@@ -57,10 +57,19 @@ func (dao *EmployeeDao) ChangePrincipal(companyId int64, employeeAccount string)
 	return nil
 	return nil
 }
 }
 
 
+// EmployeeExist 判断员工是否存在
+func (dao *EmployeeDao) EmployeeExist(oldPhone string) (bool, error) {
+	tx := dao.transactionContext.PgTx
+	m := models.Employee{}
+	query := tx.Model(&m).Where("employee_account=?", oldPhone)
+	ok, err := query.Exists()
+	return ok, err
+}
+
 // ChangePhone 修改用户手机号
 // ChangePhone 修改用户手机号
 func (dao *EmployeeDao) ChangePhone(oldPhone string, newPhone string) error {
 func (dao *EmployeeDao) ChangePhone(oldPhone string, newPhone string) error {
 	tx := dao.transactionContext.PgTx
 	tx := dao.transactionContext.PgTx
-	if _, err := tx.QueryOne(
+	if _, err := tx.Query(
 		pg.Scan(),
 		pg.Scan(),
 		"UPDATE employees SET employee_account=? WHERE employee_account=?",
 		"UPDATE employees SET employee_account=? WHERE employee_account=?",
 		newPhone, oldPhone); err != nil {
 		newPhone, oldPhone); err != nil {

@@ -16,7 +16,6 @@ func (serviceGateway *HttplibWorthServiceGateway) ChangePhoneCallback(oldPhone s
 	request := serviceGateway.createRequest(url, "post")
 	request := serviceGateway.createRequest(url, "post")
 	options := make(map[string]interface{})
 	options := make(map[string]interface{})
 	options["phone"] = oldPhone
 	options["phone"] = oldPhone
-	options["newPhone"] = newPhone
 	request.JSONBody(options)
 	request.JSONBody(options)
 	response := make(map[string]interface{})
 	response := make(map[string]interface{})
 	request.ToJSON(&response)
 	request.ToJSON(&response)