From 485dd03961f08e2e37d7c8780b23d50b2246829f Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Tue, 4 Jun 2024 15:38:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=B7=E6=A0=BC=E7=AD=96=E7=95=A5=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../smspricestrategybill/SmsPricestrategyBillService.java   | 6 +++---
 .../SmsPricestrategyBillDetail.java                         | 4 ++--
 .../SmsPricestrategyBillDetailDetailsVo.java                | 4 ++--
 .../SmsPricestrategyBillDetailDto.java                      | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybill/SmsPricestrategyBillService.java b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybill/SmsPricestrategyBillService.java
index 0162d105ae..1a0eada6e6 100644
--- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybill/SmsPricestrategyBillService.java
+++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybill/SmsPricestrategyBillService.java
@@ -199,7 +199,7 @@ public class SmsPricestrategyBillService extends MybatisBaseService<SmsPricestra
 			for (SmsPricestrategyBillDetailDto smsPricestrategyBillDetailDto : smsPricestrategyBillDetailList) {
 				smsPricestrategyBillDetailDto.setMainSid(sid);
 				String sid1 = smsPricestrategyBillDetailService.saveOrUpdateDto(smsPricestrategyBillDetailDto);
-				if (smsPricestrategyBillDetailDto.getStrategyType() == 0){
+				if (smsPricestrategyBillDetailDto.getStrategyType() == 1){
 					SmsPricestrategyBillGoodstypedetailDto smsPricestrategyBillGoodstypedetailDto = new SmsPricestrategyBillGoodstypedetailDto();
 					smsPricestrategyBillGoodstypedetailDto.setDetailSid(sid1);
 					smsPricestrategyBillGoodstypedetailDto.setMarkupRate(smsPricestrategyBillDetailDto.getGdMarkupRate());
@@ -223,7 +223,7 @@ public class SmsPricestrategyBillService extends MybatisBaseService<SmsPricestra
 		for (SmsPricestrategyBillDetailDto smsPricestrategyBillDetailDto : smsPricestrategyBillDetailList) {
 			smsPricestrategyBillDetailDto.setMainSid(dtoSid);
 			String sid1 = smsPricestrategyBillDetailService.saveOrUpdateDto(smsPricestrategyBillDetailDto);
-			if (smsPricestrategyBillDetailDto.getStrategyType() == 0){
+			if (smsPricestrategyBillDetailDto.getStrategyType() == 1){
 				SmsPricestrategyBillGoodstypedetailDto smsPricestrategyBillGoodstypedetailDto = new SmsPricestrategyBillGoodstypedetailDto();
 				smsPricestrategyBillGoodstypedetailDto.setDetailSid(sid1);
 				smsPricestrategyBillGoodstypedetailDto.setMarkupRate(smsPricestrategyBillDetailDto.getGdMarkupRate());
@@ -265,7 +265,7 @@ public class SmsPricestrategyBillService extends MybatisBaseService<SmsPricestra
 		vo.setSmsPricestrategyBillDetailList(smsPricestrategyBillDetailDetailsVos);
 		for (SmsPricestrategyBillDetailDetailsVo smsPricestrategyBillDetailDetailsVo : smsPricestrategyBillDetailDetailsVos) {
 			List<SmsPricestrategyBillGoodstypedetailDetailsVo> smsPricestrategyBillGoodstypedetailDetailsVos = smsPricestrategyBillGoodstypedetailService.selByMainSid(smsPricestrategyBillDetailDetailsVo.getSid());
-			if (smsPricestrategyBillDetailDetailsVo.getStrategyType() == 0){
+			if (smsPricestrategyBillDetailDetailsVo.getStrategyType() == 1){
 				SmsPricestrategyBillGoodstypedetailDetailsVo smsPricestrategyBillGoodstypedetailDetailsVo = smsPricestrategyBillGoodstypedetailDetailsVos.get(0);
 				smsPricestrategyBillDetailDetailsVo.setGdMarkupRate(smsPricestrategyBillGoodstypedetailDetailsVo.getMarkupRate());
 			}else {
diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybilldetail/SmsPricestrategyBillDetail.java b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybilldetail/SmsPricestrategyBillDetail.java
index af37cae943..74d126d0f6 100644
--- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybilldetail/SmsPricestrategyBillDetail.java
+++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybilldetail/SmsPricestrategyBillDetail.java
@@ -60,7 +60,7 @@ public class SmsPricestrategyBillDetail extends BaseEntity {
     private String goodsTypeCode;
 	@ApiModelProperty("商品类别名称")
     private String goodsTypeName; // 商品类别名称
-	@ApiModelProperty("价格策略类别(固定比例0、价格区间1)")
-    private Integer strategyType; // 价格策略类别(固定比例0、价格区间1)
+	@ApiModelProperty("价格策略类别(固定比例1、价格区间2)")
+    private Integer strategyType;
 
 }
diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybilldetail/SmsPricestrategyBillDetailDetailsVo.java b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybilldetail/SmsPricestrategyBillDetailDetailsVo.java
index b800c35132..bb1f6d66d0 100644
--- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybilldetail/SmsPricestrategyBillDetailDetailsVo.java
+++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybilldetail/SmsPricestrategyBillDetailDetailsVo.java
@@ -64,8 +64,8 @@ public class SmsPricestrategyBillDetailDetailsVo implements Vo {
     private String goodsTypeCode;
 	@ApiModelProperty("商品类别名称")
     private String goodsTypeName; // 商品类别名称
-	@ApiModelProperty("价格策略类别(固定比例0、价格区间1)")
-    private Integer strategyType; // 价格策略类别(固定比例0、价格区间1)
+    @ApiModelProperty("价格策略类别(固定比例1、价格区间2)")
+    private Integer strategyType;
     @ApiModelProperty("加价比例")
     private BigDecimal gdMarkupRate;
 
diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybilldetail/SmsPricestrategyBillDetailDto.java b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybilldetail/SmsPricestrategyBillDetailDto.java
index 9df9735031..b38c499753 100644
--- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybilldetail/SmsPricestrategyBillDetailDto.java
+++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybilldetail/SmsPricestrategyBillDetailDto.java
@@ -63,8 +63,8 @@ public class SmsPricestrategyBillDetailDto implements Dto {
     private String goodsTypeCode;
 	@ApiModelProperty("商品类别名称")
     private String goodsTypeName; // 商品类别名称
-	@ApiModelProperty("价格策略类别(固定比例0、价格区间1)")
-    private Integer strategyType; // 价格策略类别(固定比例0、价格区间1)
+    @ApiModelProperty("价格策略类别(固定比例1、价格区间2)")
+    private Integer strategyType;
     @ApiModelProperty("加价比例")
     private BigDecimal gdMarkupRate;