Browse Source

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 years ago
parent
commit
e38934c8e2
1 changed files with 12 additions and 1 deletions
  1. +12
    -1
      mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java

+ 12
- 1
mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java View File

@@ -471,9 +471,18 @@ public class WxCouponOrderController extends BaseController {
@ApiOperation(value = "B端核销列表链接")
@GetMapping("/getVerifiedExportUrl")
public ResultData getVerifiedExportUrl(@ModelAttribute WxCouponOrderBVo wxCouponOrder) {
//只有B端管理员才能操作这个
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()))) {
return new ResultData(ErrorCode.SYS_SERVER_ERROR.getCode(),"只有商户管理员才能进行此操作");
}
if (wxCouponOrder == null) wxCouponOrder = new WxCouponOrderBVo();
wxCouponOrder.updateTenantInfo(getTenantInfo());
StringBuffer sb = new StringBuffer("/api/couponOrder/unLogin/verifiedExport?verifyMerchantId=").append(this.getLoginBUser().getMerchantId())
StringBuffer sb = new StringBuffer("/api/couponOrder/unLogin/verifiedExport?verifyMerchantId=").append(buser.getMerchantId())
.append("&tenantId="+wxCouponOrder.getTenantId());
if (null != wxCouponOrder.getVerifyStartDate()) {
sb.append("&verifyStartDate=").append(wxCouponOrder.getVerifyStartDate());
@@ -492,6 +501,8 @@ public class WxCouponOrderController extends BaseController {
if (wxCouponOrder == null) {
return;
}
wxCouponOrder.setStartDate(DateUtils.stringToDate("2022-01-01 00:00:00",DateUtils.DATE_TIME_PATTERN));
wxCouponOrder.setEndDate(DateUtils.stringToDate("2122-01-01 00:00:00",DateUtils.DATE_TIME_PATTERN));
wxCouponOrderService.exportData(true,wxCouponOrder, request, response);
}


Loading…
Cancel
Save