Просмотр исходного кода

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

release_toaliyun_real
xhxu 3 лет назад
Родитель
Сommit
67170e1ad7
1 измененных файлов: 2 добавлений и 6 удалений
  1. +2
    -6
      mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java

+ 2
- 6
mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java Просмотреть файл

@@ -473,17 +473,13 @@ public class WxCouponOrderController extends BaseController {
public ResultData getVerifiedExportUrl(@ModelAttribute WxCouponOrderBVo wxCouponOrder) { public ResultData getVerifiedExportUrl(@ModelAttribute WxCouponOrderBVo wxCouponOrder) {
//只有B端管理员才能操作这个 //只有B端管理员才能操作这个
WxMerchantBUser buser = this.getLoginBUser(); WxMerchantBUser buser = this.getLoginBUser();
WxMerchant merchantQ= new WxMerchant();
merchantQ.updateTenantInfo(buser);
merchantQ.setId(buser.getMerchantId());
WxMerchant merchant = wxMerchantService.findOne(merchantQ);
if (!(buser.getPhone().equals(merchant.getLinkPhone()))) {
if (buser.getIsAdmin() != EnumYesOrNo.YES.getCode()) {
return new ResultData(ErrorCode.SYS_SERVER_ERROR.getCode(),"只有商户管理员才能进行此操作"); return new ResultData(ErrorCode.SYS_SERVER_ERROR.getCode(),"只有商户管理员才能进行此操作");
} }
if (wxCouponOrder == null) wxCouponOrder = new WxCouponOrderBVo(); if (wxCouponOrder == null) wxCouponOrder = new WxCouponOrderBVo();
wxCouponOrder.updateTenantInfo(getTenantInfo()); wxCouponOrder.updateTenantInfo(getTenantInfo());
StringBuffer sb = new StringBuffer("/api/couponOrder/unLogin/verifiedExport?verifyMerchantId=").append(buser.getMerchantId()) StringBuffer sb = new StringBuffer("/api/couponOrder/unLogin/verifiedExport?verifyMerchantId=").append(buser.getMerchantId())
.append("&tenantId="+wxCouponOrder.getTenantId());
.append("&tenantId="+buser.getTenantId());
if (null != wxCouponOrder.getVerifyStartDate()) { if (null != wxCouponOrder.getVerifyStartDate()) {
sb.append("&verifyStartDate=").append(wxCouponOrder.getVerifyStartDate()); sb.append("&verifyStartDate=").append(wxCouponOrder.getVerifyStartDate());
} }


Загрузка…
Отмена
Сохранить