feat：p2p amount 草稿

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

@@ -113,10 +113,16 @@ public class WmScorePackageController {
 	@PutMapping(value = "/p2p/amount")
 	@Transactional(rollbackFor = Exception.class)
 	public R<?> saveP2pAmount(@RequestBody WmScorePackage wmScorePackage) {
-		if (StrUtil.isBlank(wmScorePackage.getId()) || wmScorePackage.getP2pAmount() == null) {
+		if (StrUtil.isBlank(wmScorePackage.getId()) || wmScorePackage.getP2pAmount() == null || wmScorePackage.getP2pDraft() == null) {
 			return R.failed("参数错误");
 		}
 
+		// 如果是草稿，放入缓存
+		if (wmScorePackage.getP2pDraft()){
+			redisTemplate.opsForValue().set(String.format("scorepackage:p2p:%s", wmScorePackage.getId()), wmScorePackage.getP2pAmount().toString());
+			return R.ok();
+		}
+
 		WmScorePackage sp = new WmScorePackage();
 		sp.setId(wmScorePackage.getId());
 		sp.setP2pAmount(wmScorePackage.getP2pAmount());
@@ -134,7 +140,7 @@ public class WmScorePackageController {
 	 */
 	@ApiOperation(value = "分页查询", notes = "分页查询")
 	@GetMapping("/page")
-	public R getWmScorePackagePage(Page page, WmScorePackage wmScorePackage) {
+	public R<?> getWmScorePackagePage(Page<WmScorePackage> page, WmScorePackage wmScorePackage) {
 
 		OrderItem orderItem = new OrderItem();
 		orderItem.setColumn("create_time");
@@ -186,8 +192,21 @@ public class WmScorePackageController {
 			}
 		}
 
+		wmScorePackageService.page(page, queryWrapper);
+		page.getRecords().forEach(r -> {
+			if (r.getP2pAmount() != null){
+				r.setP2pDraft(false);
+			} else {
+				String s = redisTemplate.opsForValue().get(String.format("scorepackage:p2p:%s", r.getId()));
+				if (StrUtil.isNotBlank(s)){
+					r.setP2pAmount(new BigDecimal(s));
+				}
+				r.setP2pDraft(true);
+			}
+
+		});
 
-		return R.ok(wmScorePackageService.page(page, queryWrapper));
+		return R.ok(page);
 	}
 
 

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

@@ -509,6 +509,9 @@ public class WmScorePackage extends Model<WmScorePackage> {
 	@TableField(value = "p2p_amount")
 	public BigDecimal p2pAmount;
 
+	@TableField(exist = false)
+	public Boolean p2pDraft;
+
 	/**
 	 * 关联药品的生产厂商列表
 	 */