Merge branch 'release_toaliyun_real' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real_202210

mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java

@@ -235,11 +235,11 @@ public class WxCouponController extends BaseController {
         if (wxCoupon.getId() == null) {
             return new ResultData(ResultData.ERROR, "缺少id");
         }
+        wxCoupon.updateTenantInfo(getTenantInfo());
         WxCoupon coupon = wxCouponService.getById(wxCoupon.getId(),wxCoupon.getTenantId());
         if (null == coupon) {
-            return new ResultData(ResultData.ERROR, "券未查询到。"+wxCoupon.getId());
+            return new ResultData(ResultData.ERROR, "券未查询到。");
         }
-        wxCoupon.updateTenantInfo(getTenantInfo());
         if(EnumDelFlag.YES.getCode().equals(wxCoupon.getIsDel())){
             if(!EnumCouponStatus.COUPON_STATUS_TAKE_OFFF.getCode().equals(coupon.getStatus())){
                 return new ResultData(ResultData.ERROR, "请先作废，再进行删除。");