angelo
/
java-retail-app
3
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

## Opt - 盒数小数

This commit is contained in:
sangelxiu1 2025-06-30 16:35:22 +08:00
parent 0c4bc3900f
commit 7766c46086
4 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/manage/CuMemberSpeRetailController.java
View File

@ -68,7 +68,8 @@ public class CuMemberSpeRetailController extends BaseController {
return AjaxResult.error("会员信息不存在"); return AjaxResult.error("会员信息不存在");
} }
//校验团队总盒数大于小区盒数 //校验团队总盒数大于小区盒数
if (retailAreaParam.getTeamBoxNum() < retailAreaParam.getSmallBoxNum()) { // if (retailAreaParam.getTeamBoxNum() < retailAreaParam.getSmallBoxNum()) {
if (retailAreaParam.getTeamBoxNum().compareTo(retailAreaParam.getSmallBoxNum()) < 0) {
return AjaxResult.error("团队盒数需大于小区盒数"); return AjaxResult.error("团队盒数需大于小区盒数");
} }
//校验结算日期是否为空 //校验结算日期是否为空
@ -146,7 +147,8 @@ public class CuMemberSpeRetailController extends BaseController {
continue; continue;
} }
//校验团队总盒数大于小区盒数 //校验团队总盒数大于小区盒数
if (cma.getTeamBoxNum() < cma.getSmallBoxNum()) { // if (cma.getTeamBoxNum() < cma.getSmallBoxNum()) {
if (cma.getTeamBoxNum().compareTo(cma.getSmallBoxNum()) < 0) {
cma.setMsg("团队盒数需大于小区盒数"); cma.setMsg("团队盒数需大于小区盒数");
errorlist.add(cma); errorlist.add(cma);
continue; continue;
@ -248,7 +250,8 @@ public class CuMemberSpeRetailController extends BaseController {
return AjaxResult.error("会员信息不存在"); return AjaxResult.error("会员信息不存在");
} }
//校验团队总盒数大于小区盒数 //校验团队总盒数大于小区盒数
if (retailAreaParam.getTeamBoxNum() < retailAreaParam.getSmallBoxNum()) { // if (retailAreaParam.getTeamBoxNum() < retailAreaParam.getSmallBoxNum()) {
if (retailAreaParam.getTeamBoxNum().compareTo(retailAreaParam.getSmallBoxNum()) < 0) {
return AjaxResult.error("团队盒数需大于小区盒数"); return AjaxResult.error("团队盒数需大于小区盒数");
} }
//校验结算日期是否为空 //校验结算日期是否为空

6
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/param/RetailAreaParam.java
View File

@ -22,12 +22,12 @@ public class RetailAreaParam implements Serializable {
* 团队总盒数 * 团队总盒数
*/ */
@Excel(name = "团队总盒数") @Excel(name = "团队总盒数")
private Integer teamBoxNum = 0; private BigDecimal teamBoxNum = BigDecimal.ZERO;
/** /**
* 小区盒数 * 小区盒数
*/ */
@Excel(name = "小区盒数") @Excel(name = "小区盒数")
private Integer smallBoxNum = 0; private BigDecimal smallBoxNum = BigDecimal.ZERO;
/** /**
* 结算日期 * 结算日期
@ -56,7 +56,7 @@ public class RetailAreaParam implements Serializable {
/** /**
* 个人消费盒数 * 个人消费盒数
*/ */
private Integer consumeBoxNum; private BigDecimal consumeBoxNum;
/** /**
* 结算开始日期 * 结算开始日期

6
bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberSpeRetail.java
View File

@ -50,18 +50,18 @@ public class CuMemberSpeRetail extends BaseEntity {
* 团队总盒数 * 团队总盒数
*/ */
@TableField("TEAM_BOX_NUM") @TableField("TEAM_BOX_NUM")
private Integer teamBoxNum; private BigDecimal teamBoxNum;
/** /**
* 个人消费盒数 * 个人消费盒数
*/ */
@TableField("CONSUME_BOX_NUM") @TableField("CONSUME_BOX_NUM")
private Integer consumeBoxNum; private BigDecimal consumeBoxNum;
/** /**
* 小区盒数 * 小区盒数
*/ */
@TableField("SMALL_BOX_NUM") @TableField("SMALL_BOX_NUM")
private Integer smallBoxNum; private BigDecimal smallBoxNum;
/** /**
* 团队总pv * 团队总pv

4
sql/2025年6月30日-注水盒数小数位.sql Normal file
View File

@ -0,0 +1,4 @@
ALTER TABLE "RETAIL"."CU_MEMBER_SPE_RETAIL"
MODIFY ("TEAM_BOX_NUM" NUMBER(10,2))
MODIFY ("CONSUME_BOX_NUM" NUMBER(10,2))
MODIFY ("SMALL_BOX_NUM" NUMBER(10,2))