Переглянути джерело

feat: 公对公结算服务费

shc 2 роки тому
батько
коміт
a8be9ecd34

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

@@ -119,9 +119,14 @@ public class WmScorePackageController {
 			return R.failed("参数错误");
 		}
 
+		if (wmScorePackage.getP2pServiceAmount() == null){
+			wmScorePackage.setP2pServiceAmount(BigDecimal.ZERO);
+		}
+
 		// 如果是草稿,放入缓存
 		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);
 			return R.ok();
 		}
@@ -130,6 +135,7 @@ public class WmScorePackageController {
 		sp.setId(wmScorePackage.getId());
 		sp.setP2pAmount(wmScorePackage.getP2pAmount());
 		sp.setDescription(wmScorePackage.getDescription());
+		sp.setP2pServiceAmount(wmScorePackage.getP2pServiceAmount());
 		wmScorePackageService.updateById(sp);
 		return R.ok();
 	}
@@ -201,9 +207,11 @@ public class WmScorePackageController {
 				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)){
 					r.setP2pAmount(new BigDecimal(s));
+					r.setP2pServiceAmount(new BigDecimal(s1));
 					r.setDescription(desc);
 				}
 				r.setP2pDraft(true);
@@ -700,9 +708,11 @@ public class WmScorePackageController {
 				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)){
 					r.setP2pAmount(new BigDecimal(s));
+					r.setP2pServiceAmount(new BigDecimal(s1));
 					r.setDescription(desc);
 				}
 				r.setP2pDraft(true);
@@ -1462,9 +1472,11 @@ public class WmScorePackageController {
 					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)){
 						wmScorePackage.setP2pAmount(new BigDecimal(s));
+						wmScorePackage.setP2pServiceAmount(new BigDecimal(s1));
 						wmScorePackage.setDescription(desc);
 					}
 					wmScorePackage.setP2pDraft(true);

+ 5 - 0
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/entity/WmScorePackage.java

@@ -519,6 +519,11 @@ public class WmScorePackage extends Model<WmScorePackage> {
 	@TableField(value = "p2p_amount")
 	public BigDecimal p2pAmount;
 
+	/**
+	 * 公对公结算服务费
+	 */
+	public BigDecimal p2pServiceAmount;
+
 	@TableField(exist = false)
 	public Boolean p2pDraft;