diff --git a/business/jxstore/cms/permission.go b/business/jxstore/cms/permission.go index b67efa86d..cf7f13ce6 100644 --- a/business/jxstore/cms/permission.go +++ b/business/jxstore/cms/permission.go @@ -177,6 +177,8 @@ func UpdateUserRole(ctx *jxcontext.Context, userIDs []string, roleIDs []int) (er } } } + fmt.Println("1 ", addUserRoleMap) + fmt.Println("2 ", deleteUserRoleMap) dao.Begin(db) defer func() { if r := recover(); r != nil { diff --git a/business/partner/purchase/jx/localjx/order.go b/business/partner/purchase/jx/localjx/order.go index 81a6e0e9f..80f2ce314 100644 --- a/business/partner/purchase/jx/localjx/order.go +++ b/business/partner/purchase/jx/localjx/order.go @@ -518,6 +518,22 @@ func OnPayFinished(orderPay *model.OrderPay) (err error) { } PickupGoods(order, false, "jxadmin") // } + } else { + //普通的订单要看用没用优惠券,用了的话,要把这个用户用过的优惠券状态改了 + if order.CouponIDs != "" { + sCouponIDs := strings.Split(order.CouponIDs, ",") + couponIDs := []int{} + for _, v := range sCouponIDs { + couponIDs = append(couponIDs, utils.Str2Int(v)) + } + if userCoupons, err := dao.GetUserCoupons(db, couponIDs, []string{order.UserID}, nil, model.CouponStatusNormal); err == nil { + for _, vv := range userCoupons { + vv.UserCouponStatus = model.UserCouponStatusUsed + vv.UpdatedAt = time.Now() + dao.UpdateEntity(db, vv, "UserCouponStatus", "UpdatedAt") + } + } + } } } else { switch orderPay.PayType {