Merge branch 'feat-230613' into temp-pre

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/config/SequenceConfig.java

@@ -21,9 +21,10 @@ public class SequenceConfig {
 
 	/**
 	 * 订单流水号发号器
-	 * @param dataSource
-	 * @param properties
-	 * @return
+	 *
+	 * @param dataSource 数据源
+	 * @param properties 配置
+	 * @return 发号器
 	 */
 	@Bean
 	public Sequence paySequence(DataSource dataSource, SequenceDbProperties properties) {
@@ -32,4 +33,19 @@ public class SequenceConfig {
 				.dataSource(dataSource).step(properties.getStep()).retryTimes(properties.getRetryTimes())
 				.tableName(properties.getTableName()).build();
 	}
+
+	/**
+	 * 积分包发号器
+	 *
+	 * @param dataSource 数据源
+	 * @param properties 配置
+	 * @return 发号器
+	 */
+	@Bean(value = "pkgSequence")
+	public Sequence pkgSequence(DataSource dataSource, SequenceDbProperties properties) {
+		return DbSeqBuilder.create()
+				.bizName(() -> String.format("pkg_%s_%s", TenantContextHolder.getTenantId(), DateUtil.today()))
+				.dataSource(dataSource).step(properties.getStep()).retryTimes(properties.getRetryTimes())
+				.tableName(properties.getTableName()).build();
+	}
 }

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmScorePackageController.java

@@ -53,6 +53,7 @@ import com.qunzhixinxi.hnqz.common.core.util.R;
 import com.qunzhixinxi.hnqz.common.log.annotation.SysLog;
 import com.qunzhixinxi.hnqz.common.security.service.HnqzUser;
 import com.qunzhixinxi.hnqz.common.security.util.SecurityUtils;
+import com.qunzhixinxi.hnqz.common.sequence.sequence.Sequence;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
@@ -112,6 +113,17 @@ public class WmScorePackageController {
 	private final WmTeamService wmTeamService;
 	private final WmScorePackageSettleNoteMapper settleNoteMapper;
 	private final StringRedisTemplate redisTemplate;
+	private final Sequence pkgSequence;
+
+	/**
+	 * 获取积分包号
+	 *
+	 * @return 积分包号
+	 */
+	@GetMapping(value = "/sn")
+	public R<String> getPkgSn() {
+		return R.ok(pkgSequence.nextNo());
+	}
 
 
 	@PutMapping(value = "/p2p/amount")
@@ -121,12 +133,12 @@ public class WmScorePackageController {
 			return R.failed("参数错误");
 		}
 
-		if (wmScorePackage.getP2pServiceAmount() == null){
+		if (wmScorePackage.getP2pServiceAmount() == null) {
 			wmScorePackage.setP2pServiceAmount(BigDecimal.ZERO);
 		}
 
 		// 如果是草稿，放入缓存
-		if (wmScorePackage.getP2pDraft()){
+		if (wmScorePackage.getP2pDraft()) {
 			redisTemplate.opsForValue().set(String.format("scorepackage:p2p:amount:%s", wmScorePackage.getId()), wmScorePackage.getP2pAmount().toString(), 180, TimeUnit.DAYS);
 			redisTemplate.opsForValue().set(String.format("scorepackage:p2p:service-amount:%s", wmScorePackage.getId()), wmScorePackage.getP2pServiceAmount().toString(), 180, TimeUnit.DAYS);
 			redisTemplate.opsForValue().set(String.format("scorepackage:p2p:desc:%s", wmScorePackage.getId()), wmScorePackage.getDescription(), 180, TimeUnit.DAYS);
@@ -206,13 +218,13 @@ public class WmScorePackageController {
 
 		wmScorePackageService.page(page, queryWrapper);
 		page.getRecords().forEach(r -> {
-			if (r.getP2pAmount() != null){
+			if (r.getP2pAmount() != null) {
 				r.setP2pDraft(false);
 			} else {
 				String s = redisTemplate.opsForValue().get(String.format("scorepackage:p2p:amount:%s", r.getId()));
 				String s1 = redisTemplate.opsForValue().get(String.format("scorepackage:p2p:service-amount:%s", r.getId()));
 				String desc = redisTemplate.opsForValue().get(String.format("scorepackage:p2p:desc:%s", r.getId()));
-				if (StrUtil.isNotBlank(s)){
+				if (StrUtil.isNotBlank(s)) {
 					r.setP2pAmount(new BigDecimal(s));
 					r.setP2pServiceAmount(new BigDecimal(s1));
 					r.setDescription(desc);
@@ -711,13 +723,13 @@ public class WmScorePackageController {
 		}
 
 		page1.getRecords().forEach(r -> {
-			if (r.getP2pAmount() != null){
+			if (r.getP2pAmount() != null) {
 				r.setP2pDraft(false);
 			} else {
 				String s = redisTemplate.opsForValue().get(String.format("scorepackage:p2p:amount:%s", r.getId()));
 				String s1 = redisTemplate.opsForValue().get(String.format("scorepackage:p2p:service-amount:%s", r.getId()));
 				String desc = redisTemplate.opsForValue().get(String.format("scorepackage:p2p:desc:%s", r.getId()));
-				if (StrUtil.isNotBlank(s)){
+				if (StrUtil.isNotBlank(s)) {
 					r.setP2pAmount(new BigDecimal(s));
 					r.setP2pServiceAmount(new BigDecimal(s1));
 					r.setDescription(desc);
@@ -1476,13 +1488,13 @@ public class WmScorePackageController {
 			for (Future<WmScorePackage> future : futureList) {
 				WmScorePackage wmScorePackage = future.get();
 
-				if (wmScorePackage.getP2pAmount() != null){
+				if (wmScorePackage.getP2pAmount() != null) {
 					wmScorePackage.setP2pDraft(false);
 				} else {
 					String s = redisTemplate.opsForValue().get(String.format("scorepackage:p2p:amount:%s", wmScorePackage.getId()));
 					String s1 = redisTemplate.opsForValue().get(String.format("scorepackage:p2p:service-amount:%s", wmScorePackage.getId()));
 					String desc = redisTemplate.opsForValue().get(String.format("scorepackage:p2p:desc:%s", wmScorePackage.getId()));
-					if (StrUtil.isNotBlank(s)){
+					if (StrUtil.isNotBlank(s)) {
 						wmScorePackage.setP2pAmount(new BigDecimal(s));
 						wmScorePackage.setP2pServiceAmount(new BigDecimal(s1));
 						wmScorePackage.setDescription(desc);
@@ -2616,9 +2628,9 @@ public class WmScorePackageController {
 		long startMillis = System.currentTimeMillis();
 		Page<WmScorePackage> wmScorePackagePage = null;
 //		if (StrUtil.isNotBlank(acceptUser) || StrUtil.isNotBlank(relationScoreId)) {
-			// 带有接单对象acceptUser模糊查询的查询
-			wmScorePackagePage = wmScorePackageMapper.listScorePackage(new Page<>(current, size),
-					queryWrapper.orderByDesc("p.create_time"), acceptUser, relationScoreId, toApproval);
+		// 带有接单对象acceptUser模糊查询的查询
+		wmScorePackagePage = wmScorePackageMapper.listScorePackage(new Page<>(current, size),
+				queryWrapper.orderByDesc("p.create_time"), acceptUser, relationScoreId, toApproval);
 //		} else {
 //			wmScorePackagePage = wmScorePackageMapper.selectPage(new Page<>(current, size), queryWrapper
 //					.orderByDesc("p.create_time"));
@@ -2663,14 +2675,14 @@ public class WmScorePackageController {
 	@ApiOperation(value = "分页查询", notes = "分页查询")
 	@GetMapping("/page-settle-package")
 	public R pageSettlePackage(@RequestParam(value = "current") Integer current,
-								 @RequestParam(value = "size") Integer size,
-								 @RequestParam(value = "packageType1") String packageType1,
-								 @RequestParam(value = "packageType2") Integer packageType2,
-								 @RequestParam(value = "scorePackageName", required = false) String scorePackageName,
-								 @RequestParam(value = "scorePackageStatus", required = false) Integer scorePackageStatus,
-								 @RequestParam(value = "typeid", required = false) String typeId,
-								 @RequestParam(value = "monthStart", required = false) String monthStart,
-								 @RequestParam(value = "monthEnd", required = false) String monthEnd
+							   @RequestParam(value = "size") Integer size,
+							   @RequestParam(value = "packageType1") String packageType1,
+							   @RequestParam(value = "packageType2") Integer packageType2,
+							   @RequestParam(value = "scorePackageName", required = false) String scorePackageName,
+							   @RequestParam(value = "scorePackageStatus", required = false) Integer scorePackageStatus,
+							   @RequestParam(value = "typeid", required = false) String typeId,
+							   @RequestParam(value = "monthStart", required = false) String monthStart,
+							   @RequestParam(value = "monthEnd", required = false) String monthEnd
 	) {
 
 		Integer sendDeptId = SecurityUtils.getUser().getDeptId();
@@ -2709,7 +2721,7 @@ public class WmScorePackageController {
 		}
 
 		Page<WmScorePackage> wmScorePackagePage = wmScorePackageMapper.selectPage(new Page<>(current, size), queryWrapper
-					.orderByDesc(WmScorePackage::getCreateTime));
+				.orderByDesc(WmScorePackage::getCreateTime));
 
 		List<WmScorePackage> pageRecords = wmScorePackagePage.getRecords();
 
@@ -2793,7 +2805,7 @@ public class WmScorePackageController {
 			}
 		}
 
-		if (StrUtil.isNotBlank(wmScorePackage.getSubjectLocation())){
+		if (StrUtil.isNotBlank(wmScorePackage.getSubjectLocation())) {
 			SubjectLocation location = Enum.valueOf(SubjectLocation.class, wmScorePackage.getSubjectLocation());
 			wmScorePackage.setLocation(location);
 			wmScorePackage.setSubType(String.valueOf(location.getGigType().getCode()));