Skip to content

G
gogirl-miniapp-backend
Commit 1af5420a by huluobin
Options

update

parent 980315e5
Showing with 32 additions and 35 deletions
src/main/java/com/gogirl/application/market/impl/MarketServiceImpl.java
package com.gogirl.application.market.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.gogirl.application.market.*;
import com.gogirl.application.order.serve.OrderServeService;
import com.gogirl.domain.market.coupon.Coupon;
......@@ -334,8 +335,6 @@ public class MarketServiceImpl implements MarketService {
//抵扣的服务为 作用范围内支付金额最高的服务
OrderServe orderServe = this.queryMaxPayPrice(orderManage, serveIds);
if (orderServe != null) {
//如果有属于这个服务的辅助服务 就查出来一起折扣
OrderServe supportServe = this.querySupportServe(orderManage, orderServe);
BigDecimal actualDiscountAmount = orderServe.getPayPrice().min(timesCardUsedRecord.getDiscountAmount());
//更新次卡记录 已使用
......@@ -367,6 +366,9 @@ public class MarketServiceImpl implements MarketService {
//订单折扣金额更新
orderServe.setBindTimesCard(1);
orderServe.addDiscountPrice(actualDiscountAmount);
//业绩
orderServe.setAchievement(orderServe.getAchievement().subtract(actualDiscountAmount).add(timesCardUsedRecord.getPayAmount()));
orderManage.addDiscountPrice(actualDiscountAmount);
//更新使用次数
......@@ -439,40 +441,15 @@ public class MarketServiceImpl implements MarketService {
} else {
couponOrderRelevance.setAchievement(couponOrderRelevance.getDiscountAmount());
}
//业绩
orderServe.setAchievement(orderServe.getAchievement().subtract(actualDiscountAmount).add(couponCustomerRelevance.getPayAmount()));
orderServe.addDiscountPrice(actualDiscountAmount);
orderManage.addDiscountPrice(actualDiscountAmount);
orderServe.setBindOuterCoupon(1);
couponOrderRelevanceService.save(couponOrderRelevance);
//在从服务上折扣的钱
// BigDecimal leftServeDiscountAmount = couponCustomerRelevance.getDiscountAmount().subtract(actualDiscountAmount);
// if (supportServe != null && leftServeDiscountAmount.compareTo(BigDecimal.ZERO) > 0) {
// BigDecimal actualSupportServeDiscountAmount = leftServeDiscountAmount.min(supportServe.getPayPrice());
// //新增外部券抵扣情况记录
// CouponOrderRelevance supportCouponOrderRelevance = CouponOrderRelevance.builder()
// .couponCustomerRelevanceId(couponCustomerRelevance.getId())
// .couponId(couponCustomerRelevance.getCouponId())
// .couponName(couponCustomerRelevance.getCouponName())
// .orderServeId(supportServe.getId())
// .serveName(supportServe.getServeName())
// .orderId(orderManage.getId())
// //支付金额
// .payForOrderServe(BigDecimal.ZERO)
// //折扣金额
// .discountAmount(actualSupportServeDiscountAmount)
// .createTime(new Date())
// .confirmTime(new Date())
// .message(supportServe.getServeName())
// .customerId(orderManage.getOrderUser())
// .achievement(BigDecimal.ZERO)
// //确认可用
// .status(2)
// .build();
// couponOrderRelevanceService.save(supportCouponOrderRelevance);
//
// supportServe.addDiscountPrice(actualSupportServeDiscountAmount);
// orderManage.addDiscountPrice(actualSupportServeDiscountAmount);
// orderServe.setBindCoupon(1);
// }
} else {
throw new RRException("外部券冲突");
}
......@@ -550,6 +527,10 @@ public class MarketServiceImpl implements MarketService {
//保存卡券在订单服务上的使用请款
couponOrderRelevanceService.save(couponOrderRelevance);
List<Integer> discountConfigListCouponId = discountConfigMapper.selectList(new QueryWrapper<>()).stream().map(DiscountConfig::getCouponId).filter(Objects::nonNull).collect(Collectors.toList());
if (!discountConfigListCouponId.contains(couponCustomerRelevance.getCouponId())) {
orderServe.setAchievement(orderServe.getAchievement().subtract(actualDiscountAmount));
}
orderServe.addDiscountPrice(actualDiscountAmount);
orderManage.addDiscountPrice(actualDiscountAmount);
......
src/main/java/com/gogirl/domain/order/serve/OrderServe.java
......@@ -2,6 +2,7 @@ package com.gogirl.domain.order.serve;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.gogirl.domain.market.timescard.TimesCardUsedRecord;
import com.gogirl.domain.product.serve.BaseProduce;
import com.gogirl.domain.product.serve.BaseServe;
import com.gogirl.domain.store.store.StoreTechnician;
......@@ -259,4 +260,11 @@ public class OrderServe implements Serializable {
price.equals(promotionPrice) ||
(price.equals(produceCurrentPrice) && produceCurrentPrice.compareTo(produceBargainPrice) < 0);
}
public void calcTimesCardAchievement(TimesCardUsedRecord timesCardUsedRecord) {
this.achievement = this.achievement.subtract(timesCardUsedRecord.getDiscountAmount()).add(timesCardUsedRecord.getPayAmount());
}
}
\ No newline at end of file
src/main/java/com/gogirl/domain/store/store/Message.java
......@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.gogirl.domain.store.oa.TakeLeaveEvent;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
......@@ -28,6 +29,7 @@ public class Message {
private Integer type;
@ApiModelProperty("消息时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date time;
@ApiModelProperty("0-未读 1-已读")
......
src/main/java/com/gogirl/interfaces/xcx/MessageController.java
......@@ -9,7 +9,6 @@ import com.gogirl.domain.xcx.GogirlToken;
import com.gogirl.domain.xcx.VisitsLog;
import com.gogirl.infrastructure.common.base.JsonResult;
import com.gogirl.infrastructure.common.exception.RRException;
import com.gogirl.infrastructure.util.SessionUtils;
import com.gogirl.shared.user.command.ReadMessageCommand;
import com.gogirl.shared.user.query.qry.CustomerMessagePageQuery;
import io.swagger.annotations.Api;
......@@ -49,8 +48,11 @@ public class MessageController {
@ApiOperation(value = "小程序登入记录")
@PostMapping("/customer/message/loginLog")
public JsonResult<Integer> loginLog(@RequestHeader String token) {
Integer customerId = gogirlTokenService.getByToken(token).getCustomerId();
VisitsLog visitsLog = visitLogService.loginLog(customerId);
GogirlToken gt = gogirlTokenService.getByToken(token);
if (gt == null) {
throw new RRException(2000, "token失效");
}
VisitsLog visitsLog = visitLogService.loginLog(gt.getCustomerId());
return JsonResult.success(visitsLog.getId());
}
......@@ -86,6 +88,9 @@ public class MessageController {
@RequestParam(required = false) Integer produceId) {
GogirlToken gt = gogirlTokenService.getByToken(token);
if (gt == null) {
throw new RRException(2000, "token失效");
}
Integer customerId = gt.getCustomerId();
VisitsLog visitsLog = visitLogService.pageIn(customerId, type, activityId, shareType, shareUserId, serviceId, departmentId, pageName, produceId);
return JsonResult.success(visitsLog.getId());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment