diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponPasswordController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponPasswordController.java index 2644fd5dc..4df560f7c 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponPasswordController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponPasswordController.java @@ -11,6 +11,8 @@ import com.iformall.service.order.OrderFactory; import com.iformall.service.order.entity.WxComposeOrder; import com.iformall.utils.Constant; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @@ -19,6 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.HashMap; import java.util.Map; @RestController @@ -204,4 +207,64 @@ public class WxCouponPasswordController extends BaseController { } couponPasswordService.saveOrUpdate(updateCouponPwd); } + + @ApiOperation(value = "查询卡详情") + @GetMapping("getCardDetail") + @ApiImplicitParams({ + @ApiImplicitParam(name = "cardId", value = "券ID", dataType = "String", paramType = "query", required = true) + }) + public ResultData getCardDetail(String cardId) { + if (StringUtils.isBlank(cardId) || cardId.equalsIgnoreCase(Constant.UNDEFINED)) { + return new ResultData(ErrorCode.COUPON_IS_TAKE_OFF.getCode(),"参数错误."); + } + cardId = StringUtils.trimToNull(cardId); + WxCouponPassword password = null; + try { + password = couponPasswordService.getById(Long.parseLong(cardId)); + if (null == password) { + return new ResultData(ErrorCode.COUPON_IS_TAKE_OFF.getCode(),"参数错误."); + } + }catch(Exception e) { + return new ResultData(ErrorCode.COUPON_IS_TAKE_OFF.getCode(),"参数错误."); + } + WxCoupon coupon = couponService.getById(password.getCouponId(),password.getTenantId()); + if (coupon == null) { + return new ResultData(ErrorCode.COUPON_IS_EMPTY); + } + + Map retMap = new HashMap(); + retMap.put("title", coupon.getTitle()); + retMap.put("couponPasswordId", password.getId()); + if (null != password.getCardId()) { + WxCardInfo cardInfo = wxCardInfoService.getById(password.getCardId()); + if (null != cardInfo) { + Long owner = cardInfo.getOwnerUserId(); + if (!owner.equals(Constant.defaultCUserId)) { + WxCUserBasicInfo user = userService.getById(owner, password.getFinalTenantId()); + if (null != user) { + retMap.put("owner", user.getPhone()); + } + } + } + } + + return new ResultData(retMap); + } + + @ApiOperation(value = "实体卡转赠", notes = "{\"cardId\":\"String\",\"formId\":\"String\",\"payCheck\":\"String\",\"payPassword\":\"String\"}") + @PostMapping("transfer") + public ResultData transfer(@RequestBody Map params) { + logger.info("getCouponOrderByPassword: " + getIpAddr() + params.toString()); + String password = params.get("password"); + String formId = params.get("formId"); + String payCheck = params.get("payCheck"); + String payPassword = params.get("payPassword"); + Long memberId; + try { + memberId = getMemberId(); + } catch (Exception e) { + return new ResultData(Result.ERROR,e.getMessage()); + } + return getCouponOrderByPassword(password, formId,payCheck,payPassword, memberId,EnumPayWay.PAY_WAY_NOT_UNPAY_PASSWD,EnumPayVersion.NO_VERSION); + } } diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderNoticeSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderNoticeSchedule.java index fc784a541..e8868ec24 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderNoticeSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderNoticeSchedule.java @@ -121,7 +121,7 @@ public class CouponOrderNoticeSchedule { public void couponOrderExpiringSchedule() { List malls = getMalls(); for (WxMall mall: malls) { - Date oneDayBefore = DateUtils.getTimeAfterDays(-1, new Date()); + Date oneDayBefore = DateUtils.getTimeAfterDays(1, new Date()); List list = wxCouponOrderMapper.findExpiredFreeCouponOrderByValidDate(mall.getTenantId(),oneDayBefore); if (null != list && list.size() > 0 ) { list.stream().forEach(co -> { @@ -143,7 +143,7 @@ public class CouponOrderNoticeSchedule { public void couponOrderRefundSchedule() { List malls = getMalls(); for (WxMall mall: malls) { - Date oneDayBefore = DateUtils.getTimeAfterDays(-1, new Date()); + Date oneDayBefore = DateUtils.getTimeAfterDays(1, new Date()); List list = wxCouponOrderMapper.findExpiredCouponOrderByValidDate(mall.getTenantId(),oneDayBefore); if (null != list && list.size() > 0 ) { list.stream().forEach(co -> { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java index 02c1eb2db..14c38ee76 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -2555,10 +2555,10 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { //判断卡是否已消费 //面额与余额是否相同 - if (!cardCVo.getAmount().equals(cardCVo.getRemainingAmount())) { - logger.info("面额与余额不相同"); - return new ResultData(ErrorCode.CARD_TRANSFER_INVALID); - } +// if (!cardCVo.getAmount().equals(cardCVo.getRemainingAmount())) { +// logger.info("面额与余额不相同"); +// return new ResultData(ErrorCode.CARD_TRANSFER_INVALID); +// } //保存到转赠表中 id,coupon_order_id,tenant_id,title,amount,remain_amount,from_user,to_user,status,create_date,update_date try { saveCardTransfer(record, cardCVo); @@ -2611,10 +2611,10 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { //判断卡是否已消费 //面额与余额是否相同 - if (!cardCVo.getAmount().equals(cardCVo.getRemainingAmount())) { - logger.info("面额与余额不相同"); - return new ResultData(ErrorCode.CARD_TRANSFER_INVALID); - } +// if (!cardCVo.getAmount().equals(cardCVo.getRemainingAmount())) { +// logger.info("面额与余额不相同"); +// return new ResultData(ErrorCode.CARD_TRANSFER_INVALID); +// } return new ResultData(Result.SUCCESS, "查询成功"); }