From bb6cfae1ea79e42a24821428dfcbb671ec5feea0 Mon Sep 17 00:00:00 2001 From: yqy Date: Wed, 15 Jun 2022 11:07:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=A8=A1=E6=9D=BF=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E4=BF=AE=E6=94=B9(=E6=9A=82=E6=9C=AA=E6=B5=8B?= =?UTF-8?q?=E8=AF=95)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/CallCostServiceImpl.java | 17 +++--- .../baiye/modules/system/domain/Company.java | 2 +- .../{PayTemplate.java => PayCombo.java} | 6 +-- .../{PayTemplateLog.java => PayComboLog.java} | 12 ++--- ...PayTemplateUser.java => PayComboUser.java} | 10 ++-- .../system/domain/PayFatherTemplate.java | 3 +- .../system/repository/CompanyRepository.java | 15 ++++++ ...sitory.java => PayComboLogRepository.java} | 4 +- .../system/repository/PayComboRepository.java | 18 +++++++ .../PayFatherTemplateRepository.java | 3 ++ .../repository/PayTemplateRepository.java | 21 -------- .../repository/PayTemplateUserRepository.java | 12 ++--- ...ontroller.java => PayComboController.java} | 18 +++---- .../rest/PayFatherTemplateController.java | 16 +++++- ...ogService.java => PayComboLogService.java} | 2 +- .../system/service/PayComboService.java | 31 +++++++++++ .../service/PayFatherTemplateService.java | 13 +++++ .../system/service/PayTemplateService.java | 31 ----------- .../service/PayTemplateUserService.java | 8 +-- .../service/impl/PayComboLogServiceImpl.java | 33 ++++++++++++ ...viceImpl.java => PayComboServiceImpl.java} | 48 ++++++++--------- .../impl/PayFatherTemplateServiceImpl.java | 53 ++++++++++++------- .../impl/PayTemplateLogServiceImpl.java | 33 ------------ .../impl/PayTemplateUserServiceImpl.java | 49 +++++++++-------- .../system/service/impl/UserServiceImpl.java | 22 ++++---- 25 files changed, 268 insertions(+), 212 deletions(-) rename manage/ad-platform-management/src/main/java/com/baiye/modules/system/domain/{PayTemplate.java => PayCombo.java} (95%) rename manage/ad-platform-management/src/main/java/com/baiye/modules/system/domain/{PayTemplateLog.java => PayComboLog.java} (80%) rename manage/ad-platform-management/src/main/java/com/baiye/modules/system/domain/{PayTemplateUser.java => PayComboUser.java} (81%) rename manage/ad-platform-management/src/main/java/com/baiye/modules/system/repository/{PayTemplateLogRepository.java => PayComboLogRepository.java} (57%) create mode 100644 manage/ad-platform-management/src/main/java/com/baiye/modules/system/repository/PayComboRepository.java delete mode 100644 manage/ad-platform-management/src/main/java/com/baiye/modules/system/repository/PayTemplateRepository.java rename manage/ad-platform-management/src/main/java/com/baiye/modules/system/rest/{PayTemplateController.java => PayComboController.java} (68%) rename manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/{PayTemplateLogService.java => PayComboLogService.java} (85%) create mode 100644 manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/PayComboService.java delete mode 100644 manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/PayTemplateService.java create mode 100644 manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/PayComboLogServiceImpl.java rename manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/{PayTemplateServiceImpl.java => PayComboServiceImpl.java} (59%) delete mode 100644 manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/PayTemplateLogServiceImpl.java diff --git a/manage/ad-platform-management/src/main/java/com/baiye/modules/settlement/service/impl/CallCostServiceImpl.java b/manage/ad-platform-management/src/main/java/com/baiye/modules/settlement/service/impl/CallCostServiceImpl.java index 80e964fa..b714fdf8 100644 --- a/manage/ad-platform-management/src/main/java/com/baiye/modules/settlement/service/impl/CallCostServiceImpl.java +++ b/manage/ad-platform-management/src/main/java/com/baiye/modules/settlement/service/impl/CallCostServiceImpl.java @@ -11,9 +11,10 @@ import com.baiye.modules.settlement.dao.CallCostRepository; import com.baiye.modules.settlement.entity.CallSettlement; import com.baiye.modules.settlement.service.CallCostService; +import com.baiye.modules.system.domain.User; +import com.baiye.modules.system.repository.PayComboRepository; import com.baiye.modules.system.domain.*; import com.baiye.modules.system.repository.PayFatherTemplateRepository; -import com.baiye.modules.system.repository.PayTemplateRepository; import com.baiye.modules.system.repository.PayTemplateUserRepository; import com.baiye.modules.system.repository.UserRepository; import com.baiye.modules.system.service.CompanyService; @@ -42,7 +43,7 @@ public class CallCostServiceImpl implements CallCostService { private final PayTemplateUserRepository payTemplateUserRepository; - private final PayTemplateRepository payTemplateRepository; + private final PayComboRepository payComboRepository; private final CallCostRepository callCostRepository; private final CompanyService companyService; private final UserRepository userRepository; @@ -66,16 +67,16 @@ public class CallCostServiceImpl implements CallCostService { //查看这些人员 在套餐时间内 的总时长是否超出 注意套餐 是否已经刷新，重新计算 //1.查看当前日期是否在套餐时间范围， //2.查看前一天扣减表。有数据说明已经超出，做扣减，入库-- - List byDay = payTemplateUserRepository.findByDay(DateUtil.today()); + List byDay = payTemplateUserRepository.findByDay(DateUtil.today()); if (byDay.size() <= 0) { return; } - for (PayTemplateUser info : byDay) { + for (PayComboUser info : byDay) { long userId = info.getUserId(); Long companyId = userRepository.findUserById(userId).getCompanyId(); //查询套餐的时长 - PayTemplate payTemplate = selectCombo(info.getPayTemplateId()); + PayCombo payTemplate = selectCombo(info.getPayComboId()); //套餐时长 int callDuration = payTemplate.getCallDuration(); //查询套餐时间范围内 通话记录 @@ -127,7 +128,7 @@ public class CallCostServiceImpl implements CallCostService { * @return */ - private CallSettlement deduction(PayTemplateUser info, Long durationToday, Double estimateAmountToDay, Long companyId, CompanyDto companyById, Double price) { + private CallSettlement deduction(PayComboUser info, Long durationToday, Double estimateAmountToDay, Long companyId, CompanyDto companyById, Double price) { CallSettlement callSettlement = new CallSettlement(); long userId = info.getUserId(); Double userBalance = companyById.getUserBalance(); @@ -184,8 +185,8 @@ public class CallCostServiceImpl implements CallCostService { * @param payTemplateId * @return */ - private PayTemplate selectCombo(Long payTemplateId) { - return payTemplateRepository.findById(payTemplateId).orElseGet(PayTemplate::new); + private PayCombo selectCombo(Long payTemplateId) { + return payComboRepository.findById(payTemplateId).orElseGet(PayCombo::new); } /** diff --git a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/domain/Company.java b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/domain/Company.java index 3db89459..595c5f52 100644 --- a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/domain/Company.java +++ b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/domain/Company.java @@ -89,8 +89,8 @@ public class Company extends BaseEntity implements Serializable { @Column(name = "user_balance") private Double userBalance; - @ApiModelProperty("模板id") + @Column(name = "template_id") private Long templateId; diff --git a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/domain/PayTemplate.java b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/domain/PayCombo.java similarity index 95% rename from manage/ad-platform-management/src/main/java/com/baiye/modules/system/domain/PayTemplate.java rename to manage/ad-platform-management/src/main/java/com/baiye/modules/system/domain/PayCombo.java index 61200b92..74249f6c 100644 --- a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/domain/PayTemplate.java +++ b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/domain/PayCombo.java @@ -19,14 +19,14 @@ import java.util.Date; */ @Data @Entity -@Table(name = "tb_pay_template") +@Table(name = "tb_pay_combo") @EntityListeners(AuditingEntityListener.class) -public class PayTemplate implements Serializable { +public class PayCombo implements Serializable { private static final long serialVersionUID = 8623354712013889005L; @Id - @Column(name = "template_id") + @Column(name = "combo_id") @ApiModelProperty(value = "id") @GeneratedValue(strategy = GenerationType.IDENTITY) @NotNull(message = "ID不能为空", groups = {UpdateGroup.class}) diff --git a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/domain/PayTemplateLog.java b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/domain/PayComboLog.java similarity index 80% rename from manage/ad-platform-management/src/main/java/com/baiye/modules/system/domain/PayTemplateLog.java rename to manage/ad-platform-management/src/main/java/com/baiye/modules/system/domain/PayComboLog.java index d35f98f6..321a51e3 100644 --- a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/domain/PayTemplateLog.java +++ b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/domain/PayComboLog.java @@ -15,21 +15,21 @@ import java.util.Date; */ @Data @Entity -@Table(name = "tb_pay_template_log") +@Table(name = "tb_pay_combo_log") @EntityListeners(AuditingEntityListener.class) -public class PayTemplateLog implements Serializable { +public class PayComboLog implements Serializable { private static final long serialVersionUID = 8623354712013889005L; @Id - @Column(name = "template_log_id") + @Column(name = "combo_log_id") @ApiModelProperty(value = "id") @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; - @Column(name = "template_id") - @ApiModelProperty(value = "模板ID") - private Long templateId; + @Column(name = "combo_id") + @ApiModelProperty(value = "套餐ID") + private Long comboId; @Column(name = "user_id") @ApiModelProperty(value = "购买人用户ID") diff --git a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/domain/PayTemplateUser.java b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/domain/PayComboUser.java similarity index 81% rename from manage/ad-platform-management/src/main/java/com/baiye/modules/system/domain/PayTemplateUser.java rename to manage/ad-platform-management/src/main/java/com/baiye/modules/system/domain/PayComboUser.java index 63ac67f2..bd0755e9 100644 --- a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/domain/PayTemplateUser.java +++ b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/domain/PayComboUser.java @@ -14,9 +14,9 @@ import java.util.Date; */ @Data @Entity -@Table(name = "tb_pay_template_user") +@Table(name = "tb_pay_combo_user") @EntityListeners(AuditingEntityListener.class) -public class PayTemplateUser implements Serializable { +public class PayComboUser implements Serializable { private static final long serialVersionUID = 8623354712013889005L; @@ -26,9 +26,9 @@ public class PayTemplateUser implements Serializable { @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; - @Column(name = "pay_template_id") - @ApiModelProperty(value = "模板ID") - private Long payTemplateId; + @Column(name = "pay_combo_id") + @ApiModelProperty(value = "套餐ID") + private Long payComboId; @Column(name = "user_id") @ApiModelProperty(value = "用户ID") diff --git a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/domain/PayFatherTemplate.java b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/domain/PayFatherTemplate.java index a7cb98ca..4fa38541 100644 --- a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/domain/PayFatherTemplate.java +++ b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/domain/PayFatherTemplate.java @@ -10,6 +10,7 @@ import org.springframework.data.jpa.domain.support.AuditingEntityListener; import javax.persistence.*; import javax.validation.constraints.NotNull; import java.io.Serializable; +import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -57,5 +58,5 @@ public class PayFatherTemplate implements Serializable { private Date createTime; @Transient - private List payTemplateList; + private List payComboList = new ArrayList<>(); } diff --git a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/repository/CompanyRepository.java b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/repository/CompanyRepository.java index 74a0da32..3643d978 100644 --- a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/repository/CompanyRepository.java +++ b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/repository/CompanyRepository.java @@ -22,6 +22,7 @@ import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; import java.util.List; +import java.util.Set; /** * @author Enzo @@ -63,4 +64,18 @@ public interface CompanyRepository extends JpaRepository, JpaSpec */ @Query(value = "from Company where userBalance < 0") List findCompanyAndUserBalanceLessThanZero(); + + /** + * 模板ID集合查询 + * @param ids + * @return + */ + List findByTemplateIdIn(Set ids); + + /** + * 模板ID查询 + * @param templateId + * @return + */ + List findByTemplateId(Long templateId); } diff --git a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/repository/PayTemplateLogRepository.java b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/repository/PayComboLogRepository.java similarity index 57% rename from manage/ad-platform-management/src/main/java/com/baiye/modules/system/repository/PayTemplateLogRepository.java rename to manage/ad-platform-management/src/main/java/com/baiye/modules/system/repository/PayComboLogRepository.java index 5c2b5386..b2ea16e9 100644 --- a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/repository/PayTemplateLogRepository.java +++ b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/repository/PayComboLogRepository.java @@ -1,10 +1,10 @@ package com.baiye.modules.system.repository; -import com.baiye.modules.system.domain.PayTemplateLog; +import com.baiye.modules.system.domain.PayComboLog; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.stereotype.Repository; @Repository -public interface PayTemplateLogRepository extends JpaRepository, JpaSpecificationExecutor { +public interface PayComboLogRepository extends JpaRepository, JpaSpecificationExecutor { } diff --git a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/repository/PayComboRepository.java b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/repository/PayComboRepository.java new file mode 100644 index 00000000..8113eeca --- /dev/null +++ b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/repository/PayComboRepository.java @@ -0,0 +1,18 @@ +package com.baiye.modules.system.repository; + +import com.baiye.modules.system.domain.PayCombo; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.JpaSpecificationExecutor; +import org.springframework.stereotype.Repository; + +import java.util.Set; + +@Repository +public interface PayComboRepository extends JpaRepository, JpaSpecificationExecutor { + + Set findByFatherTemplateIdInAndStatus(Set templateIds, int status); + + Set findByFatherTemplateIdAndStatus(Long templateIds, int status); + + Set findByFatherTemplateId(Long templateId); +} diff --git a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/repository/PayFatherTemplateRepository.java b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/repository/PayFatherTemplateRepository.java index fe6035cc..af646889 100644 --- a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/repository/PayFatherTemplateRepository.java +++ b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/repository/PayFatherTemplateRepository.java @@ -5,6 +5,9 @@ import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.stereotype.Repository; +import java.util.Set; + @Repository public interface PayFatherTemplateRepository extends JpaRepository, JpaSpecificationExecutor { + void deleteByIdIn(Set ids); } diff --git a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/repository/PayTemplateRepository.java b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/repository/PayTemplateRepository.java deleted file mode 100644 index f8464700..00000000 --- a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/repository/PayTemplateRepository.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.baiye.modules.system.repository; - -import com.baiye.modules.system.domain.PayTemplate; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.JpaSpecificationExecutor; -import org.springframework.stereotype.Repository; - -import java.util.List; -import java.util.Set; - -@Repository -public interface PayTemplateRepository extends JpaRepository, JpaSpecificationExecutor { - - Set findByStatus(int zeroNumber); - - Set findByFatherTemplateIdIn(Set templateIds); - - Set findByFatherTemplateIdInAndStatus(Set templateIds, int status); - - Set findByFatherTemplateIdAndStatus(Long templateIds, int status); -} diff --git a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/repository/PayTemplateUserRepository.java b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/repository/PayTemplateUserRepository.java index 36743130..6ca703b1 100644 --- a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/repository/PayTemplateUserRepository.java +++ b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/repository/PayTemplateUserRepository.java @@ -1,6 +1,6 @@ package com.baiye.modules.system.repository; -import com.baiye.modules.system.domain.PayTemplateUser; +import com.baiye.modules.system.domain.PayComboUser; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.data.jpa.repository.Query; @@ -9,9 +9,9 @@ import org.springframework.stereotype.Repository; import java.util.List; @Repository -public interface PayTemplateUserRepository extends JpaRepository, JpaSpecificationExecutor { +public interface PayTemplateUserRepository extends JpaRepository, JpaSpecificationExecutor { - List findByUserId(Long userId); + List findByUserId(Long userId); /** @@ -19,8 +19,8 @@ public interface PayTemplateUserRepository extends JpaRepository findByDay(String day); + List findByDay(String day); } diff --git a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/rest/PayTemplateController.java b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/rest/PayComboController.java similarity index 68% rename from manage/ad-platform-management/src/main/java/com/baiye/modules/system/rest/PayTemplateController.java rename to manage/ad-platform-management/src/main/java/com/baiye/modules/system/rest/PayComboController.java index 40e59291..eb27ac55 100644 --- a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/rest/PayTemplateController.java +++ b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/rest/PayComboController.java @@ -1,8 +1,8 @@ package com.baiye.modules.system.rest; import com.baiye.http.CommonResponse; -import com.baiye.modules.system.domain.PayTemplate; -import com.baiye.modules.system.service.PayTemplateService; +import com.baiye.modules.system.domain.PayCombo; +import com.baiye.modules.system.service.PayComboService; import com.baiye.valid.AddGroup; import com.baiye.valid.UpdateGroup; import io.swagger.annotations.Api; @@ -17,27 +17,27 @@ import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("/api/payTemplate") @RequiredArgsConstructor -public class PayTemplateController { +public class PayComboController { - private final PayTemplateService payTemplateService; + private final PayComboService payComboService; @ApiOperation("新增模板") @PostMapping("/add") - public CommonResponse add(@Validated({AddGroup.class}) @RequestBody PayTemplate payTemplate){ - payTemplateService.addPayTemplate(payTemplate); + public CommonResponse add(@Validated({AddGroup.class}) @RequestBody PayCombo payCombo){ + payComboService.addPayTemplate(payCombo); return CommonResponse.createBySuccess(); } @ApiOperation("更新模板") @PostMapping("/update") - public CommonResponse update(@Validated({UpdateGroup.class}) @RequestBody PayTemplate payTemplate){ - payTemplateService.updatePayTemplate(payTemplate); + public CommonResponse update(@Validated({UpdateGroup.class}) @RequestBody PayCombo payCombo){ + payComboService.updatePayTemplate(payCombo); return CommonResponse.createBySuccess(); } @ApiOperation("查询模板列表") @GetMapping("/list") public ResponseEntity query(){ - return new ResponseEntity<>(payTemplateService.query(), HttpStatus.OK); + return new ResponseEntity<>(payComboService.query(), HttpStatus.OK); } } diff --git a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/rest/PayFatherTemplateController.java b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/rest/PayFatherTemplateController.java index 35b9a80e..e5813e7e 100644 --- a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/rest/PayFatherTemplateController.java +++ b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/rest/PayFatherTemplateController.java @@ -2,9 +2,7 @@ package com.baiye.modules.system.rest; import com.baiye.http.CommonResponse; import com.baiye.modules.system.domain.PayFatherTemplate; -import com.baiye.modules.system.domain.PayTemplate; import com.baiye.modules.system.service.PayFatherTemplateService; -import com.baiye.modules.system.service.dto.LabelOrganizeQueryCriteria; import com.baiye.modules.system.service.dto.PayFatherTemplateQueryCriteria; import com.baiye.valid.AddGroup; import com.baiye.valid.UpdateGroup; @@ -53,4 +51,18 @@ public class PayFatherTemplateController { public ResponseEntity queryAll(PayFatherTemplateQueryCriteria payFatherTemplateQueryCriteria, Pageable pageable){ return new ResponseEntity<>(payFatherTemplateService.queryAll(payFatherTemplateQueryCriteria, pageable), HttpStatus.OK); } + + @ApiOperation("查询模板列表") + @GetMapping("/list") + public ResponseEntity list(){ + return new ResponseEntity<>(payFatherTemplateService.list(), HttpStatus.OK); + } + + @ApiOperation("替换模板列表") + @GetMapping("/replace") + public CommonResponse replace(@RequestParam("replaceId") Long replaceId,@RequestParam("templateId") Long templateId){ + payFatherTemplateService.replace(replaceId, templateId); + return CommonResponse.createBySuccess(); + } + } diff --git a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/PayTemplateLogService.java b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/PayComboLogService.java similarity index 85% rename from manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/PayTemplateLogService.java rename to manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/PayComboLogService.java index ed93985c..87fa0f36 100644 --- a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/PayTemplateLogService.java +++ b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/PayComboLogService.java @@ -1,6 +1,6 @@ package com.baiye.modules.system.service; -public interface PayTemplateLogService { +public interface PayComboLogService { /** * 添加模板购买记录 diff --git a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/PayComboService.java b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/PayComboService.java new file mode 100644 index 00000000..d80a4a64 --- /dev/null +++ b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/PayComboService.java @@ -0,0 +1,31 @@ +package com.baiye.modules.system.service; + +import com.baiye.modules.system.domain.PayCombo; + +public interface PayComboService { + + /** + * 新增模板 + * @param payCombo + */ + void addPayTemplate(PayCombo payCombo); + + /** + * 更新模板 + * @param payCombo + */ + void updatePayTemplate(PayCombo payCombo); + + /** + * 查询套餐模板列表 + * @return + */ + Object query(); + + /** + * id查找模板 + * @param templateId + * @return + */ + PayCombo findTemplateById(Long templateId); +} diff --git a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/PayFatherTemplateService.java b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/PayFatherTemplateService.java index 036dd493..340bdebc 100644 --- a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/PayFatherTemplateService.java +++ b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/PayFatherTemplateService.java @@ -33,4 +33,17 @@ public interface PayFatherTemplateService { * @return */ Object queryAll(PayFatherTemplateQueryCriteria payFatherTemplateQueryCriteria, Pageable pageable); + + /** + * 查询列表 + * @return + */ + Object list(); + + /** + * 替换 + * @param replaceId + * @return + */ + void replace(Long replaceId, Long templateId); } diff --git a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/PayTemplateService.java b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/PayTemplateService.java deleted file mode 100644 index 8d94c098..00000000 --- a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/PayTemplateService.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.baiye.modules.system.service; - -import com.baiye.modules.system.domain.PayTemplate; - -public interface PayTemplateService { - - /** - * 新增模板 - * @param payTemplate - */ - void addPayTemplate(PayTemplate payTemplate); - - /** - * 更新模板 - * @param payTemplate - */ - void updatePayTemplate(PayTemplate payTemplate); - - /** - * 查询套餐模板列表 - * @return - */ - Object query(); - - /** - * id查找模板 - * @param templateId - * @return - */ - PayTemplate findTemplateById(Long templateId); -} diff --git a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/PayTemplateUserService.java b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/PayTemplateUserService.java index 12084ba4..71265628 100644 --- a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/PayTemplateUserService.java +++ b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/PayTemplateUserService.java @@ -1,6 +1,6 @@ package com.baiye.modules.system.service; -import com.baiye.modules.system.domain.PayTemplateUser; +import com.baiye.modules.system.domain.PayComboUser; /** * @author @Enzo @@ -10,15 +10,15 @@ public interface PayTemplateUserService { /** * 添加 - * @param payTemplateUser + * @param payComboUser * @return 返回结果 */ - Boolean add(PayTemplateUser payTemplateUser); + Boolean add(PayComboUser payComboUser); /** * 用户id查找 * @param id * @return */ - PayTemplateUser queryUserByUserId(Long id); + PayComboUser queryUserByUserId(Long id); } diff --git a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/PayComboLogServiceImpl.java b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/PayComboLogServiceImpl.java new file mode 100644 index 00000000..e7a2e1ac --- /dev/null +++ b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/PayComboLogServiceImpl.java @@ -0,0 +1,33 @@ +package com.baiye.modules.system.service.impl; + +import com.baiye.modules.system.domain.PayComboLog; +import com.baiye.modules.system.repository.PayComboLogRepository; +import com.baiye.modules.system.service.PayComboLogService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +/** + * @author yqy + * @date + */ +@Service +@RequiredArgsConstructor +@Slf4j +public class PayComboLogServiceImpl implements PayComboLogService { + + private final PayComboLogRepository payComboLogRepository; + + @Override + @Transactional(rollbackFor = Exception.class) + public void addPayTemplateLog(Long templateId, Long userId, Boolean result) { + PayComboLog payComboLog = new PayComboLog(); + if (templateId != null && userId != null){ + payComboLog.setComboId(templateId); + payComboLog.setIsBuySuccess(result); + payComboLog.setUserId(userId); + payComboLogRepository.save(payComboLog); + } + } +} diff --git a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/PayTemplateServiceImpl.java b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/PayComboServiceImpl.java similarity index 59% rename from manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/PayTemplateServiceImpl.java rename to manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/PayComboServiceImpl.java index 1e384aa3..001f8c54 100644 --- a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/PayTemplateServiceImpl.java +++ b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/PayComboServiceImpl.java @@ -2,10 +2,10 @@ package com.baiye.modules.system.service.impl; import cn.hutool.core.collection.CollUtil; import com.baiye.constant.DefaultNumberConstants; -import com.baiye.modules.system.domain.PayTemplate; -import com.baiye.modules.system.repository.PayTemplateRepository; +import com.baiye.modules.system.domain.PayCombo; +import com.baiye.modules.system.repository.PayComboRepository; import com.baiye.modules.system.service.CompanyService; -import com.baiye.modules.system.service.PayTemplateService; +import com.baiye.modules.system.service.PayComboService; import com.baiye.modules.system.service.dto.CompanyDto; import com.baiye.util.SecurityUtils; import com.baiye.util.StringUtils; @@ -28,9 +28,9 @@ import java.util.Set; @Service @RequiredArgsConstructor @Slf4j -public class PayTemplateServiceImpl implements PayTemplateService { +public class PayComboServiceImpl implements PayComboService { - private final PayTemplateRepository payTemplateRepository; + private final PayComboRepository payComboRepository; private final CompanyService companyService; @Value("${payTemplate.base_fee}") private Double baseFee; @@ -39,25 +39,25 @@ public class PayTemplateServiceImpl implements PayTemplateService { @Override @Transactional(rollbackFor = Exception.class) - public void addPayTemplate(PayTemplate payTemplate) { - payTemplate.setStatus(DefaultNumberConstants.ZERO_NUMBER); - String format = new DecimalFormat("#.00").format(payTemplate.getAmount()); + public void addPayTemplate(PayCombo payCombo) { + payCombo.setStatus(DefaultNumberConstants.ZERO_NUMBER); + String format = new DecimalFormat("#.00").format(payCombo.getAmount()); Double amount = Double.parseDouble(format); - payTemplate.setAmount(amount); - payTemplate.setBaseAmount(baseFee); - payTemplateRepository.save(payTemplate); + payCombo.setAmount(amount); + payCombo.setBaseAmount(baseFee); + payComboRepository.save(payCombo); } @Override @Transactional(rollbackFor = Exception.class) @CacheEvict(value = "templateCache", key = "'template:' + #p0.getId()") - public void updatePayTemplate(PayTemplate payTemplate) { - Integer status = payTemplate.getStatus(); - String packageName = payTemplate.getPackageName(); - Double amount = payTemplate.getAmount(); - Integer callDuration = payTemplate.getCallDuration(); - Integer packageDay = payTemplate.getPackageDay(); - PayTemplate updateTemplate = payTemplateRepository.findById(payTemplate.getId()).orElseGet(PayTemplate::new); + public void updatePayTemplate(PayCombo payCombo) { + Integer status = payCombo.getStatus(); + String packageName = payCombo.getPackageName(); + Double amount = payCombo.getAmount(); + Integer callDuration = payCombo.getCallDuration(); + Integer packageDay = payCombo.getPackageDay(); + PayCombo updateTemplate = payComboRepository.findById(payCombo.getId()).orElseGet(PayCombo::new); if (status != null){ updateTemplate.setStatus(status); } @@ -73,7 +73,7 @@ public class PayTemplateServiceImpl implements PayTemplateService { if (packageDay != null){ updateTemplate.setPackageDay(packageDay); } - payTemplateRepository.save(updateTemplate); + payComboRepository.save(updateTemplate); } @Override @@ -82,10 +82,10 @@ public class PayTemplateServiceImpl implements PayTemplateService { CompanyDto company = companyService.findCompanyById(SecurityUtils.getCurrentUserId()); Long fatherTemplateId = company.getTemplateId(); //2、查询 - Set payTemplates = payTemplateRepository.findByFatherTemplateIdAndStatus(fatherTemplateId, DefaultNumberConstants.ZERO_NUMBER); + Set payCombos = payComboRepository.findByFatherTemplateIdAndStatus(fatherTemplateId, DefaultNumberConstants.ZERO_NUMBER); HashMap map = new HashMap<>(); - if (CollUtil.isNotEmpty(payTemplates)){ - map.put("list",payTemplates); + if (CollUtil.isNotEmpty(payCombos)){ + map.put("list", payCombos); map.put("baseFee",baseFee); map.put("beyondFee",beyondFee); } @@ -94,7 +94,7 @@ public class PayTemplateServiceImpl implements PayTemplateService { @Override @Cacheable(value = "templateCache", key = "'template:' + #p0") - public PayTemplate findTemplateById(Long templateId) { - return payTemplateRepository.findById(templateId).orElseGet(PayTemplate::new); + public PayCombo findTemplateById(Long templateId) { + return payComboRepository.findById(templateId).orElseGet(PayCombo::new); } } diff --git a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/PayFatherTemplateServiceImpl.java b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/PayFatherTemplateServiceImpl.java index f4652312..7b993adc 100644 --- a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/PayFatherTemplateServiceImpl.java +++ b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/PayFatherTemplateServiceImpl.java @@ -2,16 +2,17 @@ package com.baiye.modules.system.service.impl; import cn.hutool.core.collection.CollUtil; import com.baiye.constant.DefaultNumberConstants; -import com.baiye.modules.system.domain.LabelOrganize; +import com.baiye.exception.BadRequestException; +import com.baiye.modules.system.domain.Company; import com.baiye.modules.system.domain.PayFatherTemplate; -import com.baiye.modules.system.domain.PayTemplate; +import com.baiye.modules.system.domain.PayCombo; +import com.baiye.modules.system.repository.CompanyRepository; import com.baiye.modules.system.repository.PayFatherTemplateRepository; -import com.baiye.modules.system.repository.PayTemplateRepository; +import com.baiye.modules.system.repository.PayComboRepository; import com.baiye.modules.system.service.PayFatherTemplateService; import com.baiye.modules.system.service.dto.PayFatherTemplateQueryCriteria; import com.baiye.util.PageUtil; import com.baiye.util.QueryHelp; -import com.baiye.util.SecurityUtils; import com.baiye.util.StringUtils; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -23,7 +24,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.text.DecimalFormat; -import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; @@ -39,7 +39,8 @@ import java.util.stream.Collectors; public class PayFatherTemplateServiceImpl implements PayFatherTemplateService { private final PayFatherTemplateRepository payFatherTemplateRepository; - private final PayTemplateRepository payTemplateRepository; + private final PayComboRepository payComboRepository; + private final CompanyRepository companyRepository; @Override @Transactional(rollbackFor = Exception.class) @@ -78,17 +79,11 @@ public class PayFatherTemplateServiceImpl implements PayFatherTemplateService { @Override @Transactional(rollbackFor = Exception.class) public void del(Set ids) { - Set payTemplateSet = payTemplateRepository.findByFatherTemplateIdInAndStatus(ids, DefaultNumberConstants.ZERO_NUMBER); - if (CollUtil.isNotEmpty(payTemplateSet)){ - payTemplateSet.forEach(ps -> ps.setStatus(DefaultNumberConstants.ONE_NUMBER)); - payTemplateRepository.saveAll(payTemplateSet); + List companies = companyRepository.findByTemplateIdIn(ids); + if (CollUtil.isNotEmpty(companies)){ + throw new BadRequestException("模板已绑定用户,请操作替换后然后删除"); } - List payFatherTemplateList = payFatherTemplateRepository.findAllById(ids); - if (CollUtil.isNotEmpty(payFatherTemplateList)){ - payFatherTemplateList.forEach(pt -> pt.setStatus(DefaultNumberConstants.ONE_NUMBER)); - payFatherTemplateRepository.saveAll(payFatherTemplateList); - } - //删除逻辑下面套餐全部更新删除,TODO：公司绑定ID重新修改？强制一个新的？？？ + payFatherTemplateRepository.deleteByIdIn(ids); } @Override @@ -98,15 +93,35 @@ public class PayFatherTemplateServiceImpl implements PayFatherTemplateService { Page all = payFatherTemplateRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root, payFatherTemplateQueryCriteria, criteriaBuilder), pageRequest); if (CollUtil.isNotEmpty(all)){ Set templateIds = all.stream().map(PayFatherTemplate::getId).collect(Collectors.toSet()); - Set payTemplates = payTemplateRepository.findByFatherTemplateIdInAndStatus(templateIds, DefaultNumberConstants.ZERO_NUMBER); - Map> fatherGroupMap = payTemplates.stream().collect(Collectors.groupingBy(PayTemplate::getFatherTemplateId)); + Set payCombos = payComboRepository.findByFatherTemplateIdInAndStatus(templateIds, DefaultNumberConstants.ZERO_NUMBER); + Map> fatherGroupMap = payCombos.stream().collect(Collectors.groupingBy(PayCombo::getFatherTemplateId)); for (PayFatherTemplate payFatherTemplate : all) { Long id = payFatherTemplate.getId(); if (fatherGroupMap.containsKey(id)){ - payFatherTemplate.setPayTemplateList(fatherGroupMap.get(id)); + payFatherTemplate.setPayComboList(fatherGroupMap.get(id)); } } } return PageUtil.toPage(all); } + + @Override + public Object list() { + return payFatherTemplateRepository.findAll(); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void replace(Long replaceId, Long templateId) { + Set payComboSet = payComboRepository.findByFatherTemplateId(templateId); + if (CollUtil.isNotEmpty(payComboSet)){ + payComboSet.forEach(ps -> ps.setFatherTemplateId(replaceId)); + payComboRepository.saveAll(payComboSet); + } + List companyList = companyRepository.findByTemplateId(templateId); + if (CollUtil.isNotEmpty(companyList)){ + companyList.forEach(ct -> ct.setTemplateId(replaceId)); + companyRepository.saveAll(companyList); + } + } } diff --git a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/PayTemplateLogServiceImpl.java b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/PayTemplateLogServiceImpl.java deleted file mode 100644 index b5906c54..00000000 --- a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/PayTemplateLogServiceImpl.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.baiye.modules.system.service.impl; - -import com.baiye.modules.system.domain.PayTemplateLog; -import com.baiye.modules.system.repository.PayTemplateLogRepository; -import com.baiye.modules.system.service.PayTemplateLogService; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -/** - * @author yqy - * @date - */ -@Service -@RequiredArgsConstructor -@Slf4j -public class PayTemplateLogServiceImpl implements PayTemplateLogService { - - private final PayTemplateLogRepository payTemplateLogRepository; - - @Override - @Transactional(rollbackFor = Exception.class) - public void addPayTemplateLog(Long templateId, Long userId, Boolean result) { - PayTemplateLog payTemplateLog = new PayTemplateLog(); - if (templateId != null && userId != null){ - payTemplateLog.setTemplateId(templateId); - payTemplateLog.setIsBuySuccess(result); - payTemplateLog.setUserId(userId); - payTemplateLogRepository.save(payTemplateLog); - } - } -} diff --git a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/PayTemplateUserServiceImpl.java b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/PayTemplateUserServiceImpl.java index a9f8a1c1..b62bd9b4 100644 --- a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/PayTemplateUserServiceImpl.java +++ b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/PayTemplateUserServiceImpl.java @@ -3,13 +3,12 @@ package com.baiye.modules.system.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DateField; import cn.hutool.core.date.DateUtil; -import com.baiye.modules.system.domain.PayTemplate; -import com.baiye.modules.system.domain.PayTemplateUser; -import com.baiye.modules.system.repository.PayTemplateRepository; +import com.baiye.modules.system.domain.PayCombo; +import com.baiye.modules.system.domain.PayComboUser; +import com.baiye.modules.system.repository.PayComboRepository; import com.baiye.modules.system.repository.PayTemplateUserRepository; import com.baiye.modules.system.repository.UserRepository; import com.baiye.modules.system.service.PayTemplateUserService; -import com.baiye.modules.system.service.UserService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -29,52 +28,52 @@ public class PayTemplateUserServiceImpl implements PayTemplateUserService { private final PayTemplateUserRepository payTemplateUserRepository; - private final PayTemplateRepository payTemplateRepository; + private final PayComboRepository payComboRepository; private final UserRepository userRepository; @Override @Transactional(rollbackFor = Exception.class) - public Boolean add(PayTemplateUser payTemplateUser) { - Long userId = payTemplateUser.getUserId(); - Long payTemplateId = payTemplateUser.getPayTemplateId(); + public Boolean add(PayComboUser payComboUser) { + Long userId = payComboUser.getUserId(); + Long payTemplateId = payComboUser.getPayComboId(); if (userId != null && payTemplateId != null) { - List userList = payTemplateUserRepository.findByUserId(userId); - PayTemplate payTemplate = payTemplateRepository.findById(payTemplateId).orElseGet(PayTemplate::new); + List userList = payTemplateUserRepository.findByUserId(userId); + PayCombo payCombo = payComboRepository.findById(payTemplateId).orElseGet(PayCombo::new); //当前时间 Date createTime = DateUtil.date(); - Integer packageDay = payTemplate.getPackageDay(); + Integer packageDay = payCombo.getPackageDay(); Date newDate = DateUtil.offset(createTime, DateField.DAY_OF_MONTH, packageDay); if (CollUtil.isNotEmpty(userList)) { - PayTemplateUser payTemplateUserOne = userList.get(0); - Date endTime = payTemplateUserOne.getEndTime(); + PayComboUser payComboUserOne = userList.get(0); + Date endTime = payComboUserOne.getEndTime(); //当createTime小于endTime时返回true，当大于等于时返回false if (createTime.before(endTime)) { //修改结束日期 - newDate = DateUtil.offset(payTemplateUserOne.getEndTime(), DateField.DAY_OF_MONTH, packageDay); - payTemplateUserOne.setEndTime(newDate); + newDate = DateUtil.offset(payComboUserOne.getEndTime(), DateField.DAY_OF_MONTH, packageDay); + payComboUserOne.setEndTime(newDate); } else { //重置开始和结束日期 - payTemplateUserOne.setBeginTime(createTime); - payTemplateUserOne.setEndTime(newDate); + payComboUserOne.setBeginTime(createTime); + payComboUserOne.setEndTime(newDate); } userRepository.updateExpirationTimeById(newDate,userId); - return payTemplateUserRepository.save(payTemplateUserOne).getId() != null; + return payTemplateUserRepository.save(payComboUserOne).getId() != null; } else { - PayTemplateUser addPayTemplateUser = new PayTemplateUser(); - addPayTemplateUser.setPayTemplateId(payTemplateId); - addPayTemplateUser.setUserId(userId); - addPayTemplateUser.setBeginTime(createTime); - addPayTemplateUser.setEndTime(newDate); + PayComboUser addPayComboUser = new PayComboUser(); + addPayComboUser.setPayComboId(payTemplateId); + addPayComboUser.setUserId(userId); + addPayComboUser.setBeginTime(createTime); + addPayComboUser.setEndTime(newDate); userRepository.updateExpirationTimeById(newDate, userId); - return payTemplateUserRepository.save(addPayTemplateUser).getId() != null; + return payTemplateUserRepository.save(addPayComboUser).getId() != null; } } return Boolean.FALSE; } @Override - public PayTemplateUser queryUserByUserId(Long id) { + public PayComboUser queryUserByUserId(Long id) { return payTemplateUserRepository.findTemplateByUserId(id); } } diff --git a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/UserServiceImpl.java b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/UserServiceImpl.java index 07dbae05..1af6325d 100644 --- a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/UserServiceImpl.java +++ b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/UserServiceImpl.java @@ -80,8 +80,8 @@ public class UserServiceImpl implements UserService { private final PasswordEncoder passwordEncoder; private final OnlineUserService onlineUserService; private final OrganizeRepository organizeRepository; - private final PayTemplateService payTemplateService; - private final PayTemplateLogService payTemplateLogService; + private final PayComboService payComboService; + private final PayComboLogService payComboLogService; private final PayTemplateUserService payTemplateUserService; private final OrganizeUserRepository organizeUserRepository; @@ -545,10 +545,10 @@ public class UserServiceImpl implements UserService { if (CollUtil.isNotEmpty(userIds) && ObjectUtil.isNotNull(templateId)) { Long companyId = SecurityUtils.getCompanyId(); - PayTemplate payTemplate = - payTemplateService.findTemplateById(templateId); - if (ObjectUtil.isNull(payTemplate) - || payTemplate.getStatus() == DefaultNumberConstants.ONE_NUMBER) { + PayCombo payCombo = + payComboService.findTemplateById(templateId); + if (ObjectUtil.isNull(payCombo) + || payCombo.getStatus() == DefaultNumberConstants.ONE_NUMBER) { throw new BadRequestException(ResponseCode.PACKAGE_ERROR.getDesc()); } @@ -562,7 +562,7 @@ public class UserServiceImpl implements UserService { companyById.getUserBalance() != null ? companyById.getUserBalance() : DefaultNumberConstants.ZERO_NUMBER; // 计算金额 - Double totalAmount = NumberUtil.add(payTemplate.getAmount(), payTemplate.getBaseAmount()); + Double totalAmount = NumberUtil.add(payCombo.getAmount(), payCombo.getBaseAmount()); totalAmount = NumberUtil.mul(totalAmount, Double.valueOf(String.valueOf(userIds.size()))); double deductionBalance = NumberUtil.sub(balance, totalAmount); // 判断余额 @@ -571,14 +571,14 @@ public class UserServiceImpl implements UserService { } // 扣减余额 companyService.updateUserBalanceByCompanyId(deductionBalance, companyId); - PayTemplateUser templateUser; + PayComboUser templateUser; for (Long userId : userIds) { - templateUser = new PayTemplateUser(); + templateUser = new PayComboUser(); templateUser.setUserId(userId); - templateUser.setPayTemplateId(templateId); + templateUser.setPayComboId(templateId); // 插入信息 Boolean result = payTemplateUserService.add(templateUser); - payTemplateLogService.addPayTemplateLog(templateId, userId, result); + payComboLogService.addPayTemplateLog(templateId, userId, result); } } }