1

business/jxcallback/scheduler/basesch/basesch.go

@@ -135,8 +135,10 @@ func (c *BaseScheduler) SelfDeliverDelivering(order *model.GoodsOrder, userName
 					orderStatus, _ := partner.GetPurchasePlatformFromVendorID(order.VendorID).OrderLogisticsStatus(utils.Str2Int64(order.VendorOrderID))
 					if orderStatus == 100 { // 美团取消配送单
 						partner.CurOrderManager.OnOrderMsg(order, "美团外卖转自送成功.", "")
+						err = nil
 					} else if strings.Contains(err.Error(), "包裹不存在") || strings.Contains(err.Error(), "运单不存在") || strings.Contains(err.Error(), "1071") || strings.Contains(err.Error(), "1014") || strings.Contains(err.Error(), "invalid character 'o' looking for beginning of value") {
 						partner.CurOrderManager.OnOrderMsg(order, "美团外卖转自送可能成功,异常:", err.Error())
+						err = nil
 					} else {
 						bill, _ := partner.CurOrderManager.LoadWaybill(order.VendorWaybillID, order.WaybillVendorID)
 						c.CancelWaybill(bill, partner.CancelWaybillReasonOther, partner.CancelWaybillReasonStrActive)

business/model/dao/dao_user.go

@@ -32,7 +32,7 @@ func GetUserByID(db *DaoDB, fieldName, fieldValue string) (user *model.User, err
 	sql := fmt.Sprintf(`
 	SELECT *
 	FROM user t1
-	WHERE t1.deleted_at = ? AND t1.status = ? AND t1.%s = ?
+	WHERE t1.deleted_at = ? AND t1.status = ? AND t1.%s = ?  
 	`, fieldName)
 	sqlParams := []interface{}{
 		utils.DefaultTimeValue,

controllers/cms_user2.go

@@ -127,7 +127,7 @@ func (c *User2Controller) SolveNullMobileUser() {
 // @Param	token			header		string	true	"认证token"
 // @Success 200 {object} controllers.CallResult
 // @Failure 200 {object} controllers.CallResult
-// @router /GetStoreRoleList [get]
+// @router RoleList [get]
 func (c *User2Controller) GetStoreRoleList() {
 	c.callGetStoreRoleList(func(params *tUser2GetStoreRoleListParams) (retVal interface{}, errCode string, err error) {
 		retVal, err = cms.GetStoreRoleList(params.Ctx)