2024年4月19日17:35:01

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/activity/entity/Activity.java

@@ -77,7 +77,7 @@ public class Activity implements Serializable {
 	 * 是否已删除（0 否 1是）
 	 */
 	@ApiModelProperty(value = "是否已删除（0 否 1是）")
-	@TableLogic(value = "0", delval = "1")
+
 	private Integer isDeleted;
 	/**
 	 * 备注

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/activity/entity/ActivityItems.java

@@ -73,7 +73,7 @@ public class ActivityItems implements Serializable {
 	 * 是否已删除（0 否 1是）
 	 */
 	@ApiModelProperty(value = "是否已删除（0 否 1是）")
-	@TableLogic(value = "0", delval = "1")
+
 	private Integer isDeleted;
 	/**
 	 * 备注

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/BrandFigure.java

@@ -105,7 +105,7 @@ public class BrandFigure implements Serializable {
 	 * 是否已删除（0 否 1是）
 	 */
 	@ApiModelProperty(value = "是否已删除（0 否 1是）")
-	@TableLogic(value = "0", delval = "1")
+
 	private Integer isDeleted;
 	/**
 	 * 花纹

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjAccountManagement.java

@@ -79,7 +79,7 @@ public class PjAccountManagement implements Serializable {
 	 * 是否已删除（0 否 1是）
 	 */
 	@ApiModelProperty(value = "是否已删除（0 否 1是）")
-	@TableLogic(value = "0", delval = "1")
+
 	private Integer isDeleted;
 	/**
 	 * 备注

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjBrandDesc.java

@@ -101,7 +101,7 @@ public class PjBrandDesc implements Serializable {
 	 * 是否已删除（0 否 1是）
 	 */
 	@ApiModelProperty(value = "是否已删除（0 否 1是）")
-	@TableLogic(value = "0", delval = "1")
+
 	private Integer isDeleted;
 	/**
 	 * 备注

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjBrandFiles.java

@@ -116,7 +116,7 @@ public class PjBrandFiles implements Serializable {
 	* 是否已删除（0 否 1是）
 	*/
 		@ApiModelProperty(value = "是否已删除（0 否 1是）")
-		@TableLogic(value = "0", delval = "1")
+
 		private Integer isDeleted;
 	/**
 	* 分类（1 主表  2 明细）

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjCorpsAddr.java

@@ -85,7 +85,7 @@ public class PjCorpsAddr implements Serializable {
 	* 是否已删除（0 否 1是）
 	*/
 		@ApiModelProperty(value = "是否已删除（0 否 1是）")
-		@TableLogic(value = "0", delval = "1")
+
 		private Integer isDeleted;
 	/**
 	* 备注

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjCorpsDesc.java

@@ -82,7 +82,7 @@ public class PjCorpsDesc implements Serializable {
 	 * 是否已删除（0 否 1是）
 	 */
 	@ApiModelProperty(value = "是否已删除（0 否 1是）")
-	@TableLogic(value = "0", delval = "1")
+
 	private Integer isDeleted;
 	/**
 	 * 备注

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjCorpsFiles.java

@@ -114,7 +114,7 @@ public class PjCorpsFiles implements Serializable {
 	* 是否已删除（0 否 1是）
 	*/
 		@ApiModelProperty(value = "是否已删除（0 否 1是）")
-		@TableLogic(value = "0", delval = "1")
+
 		private Integer isDeleted;
 	/**
 	* 分类（1 主表  2 明细）

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjCorpsType.java

@@ -120,7 +120,7 @@ public class PjCorpsType implements Serializable {
 	 */
 	//@TableLogic
 	@ApiModelProperty(value = "是否已删除")
-	@TableLogic(value = "0", delval = "1")
+
 	private Integer isDeleted;
 	/**
 	 * 父级名称

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjGoodsDesc.java

@@ -81,7 +81,7 @@ public class PjGoodsDesc implements Serializable {
 	 * 是否已删除（0 否 1是）
 	 */
 	@ApiModelProperty(value = "是否已删除（0 否 1是）")
-	@TableLogic(value = "0", delval = "1")
+
 	private Integer isDeleted;
 	/**
 	 * 备注

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjGoodsFiles.java

@@ -117,7 +117,7 @@ public class PjGoodsFiles implements Serializable {
 	* 是否已删除（0 否 1是）
 	*/
 		@ApiModelProperty(value = "是否已删除（0 否 1是）")
-		@TableLogic(value = "0", delval = "1")
+
 		private Integer isDeleted;
 	/**
 	* 分类（1 主表  2 明细）

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjGoodsType.java

@@ -127,7 +127,7 @@ public class PjGoodsType implements Serializable {
 	 */
 	//@TableLogic
 	@ApiModelProperty(value = "是否已删除（0 否 1是）")
-	@TableLogic(value = "0", delval = "1")
+
 	private Integer isDeleted;
 
 	/**

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjHistory.java

@@ -82,7 +82,7 @@ public class PjHistory implements Serializable {
 	* 是否已删除（0 否 1是）
 	*/
 		@ApiModelProperty(value = "是否已删除（0 否 1是）")
-		@TableLogic(value = "0", delval = "1")
+
 		private Integer isDeleted;
 	/**
 	* 备注

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjOrder.java

@@ -113,7 +113,7 @@ public class PjOrder implements Serializable {
 	 * 是否已删除（0 否 1是）
 	 */
 	@ApiModelProperty(value = "是否已删除（0 否 1是）")
-	@TableLogic(value = "0", delval = "1")
+
 	private Integer isDeleted;
 	/**
 	 * 备注

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjPayment.java

@@ -84,7 +84,7 @@ public class PjPayment implements Serializable {
 	* 是否已删除（0 否 1是）
 	*/
 		@ApiModelProperty(value = "是否已删除（0 否 1是）")
-		@TableLogic(value = "0", delval = "1")
+
 		private Integer isDeleted;
 	/**
 	* 备注

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjProductLaunch.java

@@ -83,7 +83,7 @@ public class PjProductLaunch implements Serializable {
 	 * 是否已删除（0 否 1是）
 	 */
 	@ApiModelProperty(value = "是否已删除（0 否 1是）")
-	@TableLogic(value = "0", delval = "1")
+
 	private Integer isDeleted;
 	/**
 	 * 备注

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjProductLaunchFiles.java

@@ -117,7 +117,7 @@ public class PjProductLaunchFiles implements Serializable {
 	* 是否已删除（0 否 1是）
 	*/
 		@ApiModelProperty(value = "是否已删除（0 否 1是）")
-		@TableLogic(value = "0", delval = "1")
+
 		private Integer isDeleted;
 	/**
 	* 分类（1 主表  2 明细）

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjSettlement.java

@@ -76,7 +76,7 @@ public class PjSettlement implements Serializable {
 	 * 是否已删除（0 否 1是）
 	 */
 	@ApiModelProperty(value = "是否已删除（0 否 1是）")
-	@TableLogic(value = "0", delval = "1")
+
 	private Integer isDeleted;
 	/**
 	 * 备注

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjSettlementItems.java

@@ -86,7 +86,7 @@ public class PjSettlementItems implements Serializable {
 	 * 是否已删除（0 否 1是）
 	 */
 	@ApiModelProperty(value = "是否已删除（0 否 1是）")
-	@TableLogic(value = "0", delval = "1")
+
 	private Integer isDeleted;
 	/**
 	 * 备注

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjShip.java

@@ -153,7 +153,7 @@ public class PjShip implements Serializable {
 	 * 是否已删除（0 否 1是）
 	 */
 	@ApiModelProperty(value = "是否已删除（0 否 1是）")
-	@TableLogic(value = "0", delval = "1")
+
 	private Integer isDeleted;
 	/**
 	 * 备注

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjShoppingCart.java

@@ -99,9 +99,7 @@ public class PjShoppingCart implements Serializable {
 	* 是否已删除（0 否 1是）
 	*/
 		@ApiModelProperty(value = "是否已删除（0 否 1是）")
-		@TableLogic(value = "0", delval = "1")
 		private Integer isDeleted;
-
 	/**
 	* 备注
 	*/

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjStockDesc.java

@@ -82,7 +82,7 @@ public class PjStockDesc implements Serializable {
 	 * 是否已删除（0 否 1是）
 	 */
 	@ApiModelProperty(value = "是否已删除（0 否 1是）")
-	@TableLogic(value = "0", delval = "1")
+
 	private Integer isDeleted;
 	/**
 	 * 备注

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjStorageDesc.java

@@ -82,7 +82,7 @@ public class PjStorageDesc implements Serializable {
 	* 是否已删除（0 否 1是）
 	*/
 		@ApiModelProperty(value = "是否已删除（0 否 1是）")
-		@TableLogic(value = "0", delval = "1")
+
 		private Integer isDeleted;
 	/**
 	* 备注

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjpfFiles.java

@@ -78,7 +78,7 @@ public class PjpfFiles implements Serializable {
     /**
      * 状态（0 正常 1停用）
      */
-	@TableLogic(value = "0", delval = "1")
+
     private Integer status;
 
     /**

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/ProjectGoods.java

@@ -171,7 +171,7 @@ public class ProjectGoods implements Serializable {
 	 * 是否已删除（0 否 1是）
 	 */
 	@ApiModelProperty(value = "是否已删除（0 否 1是）")
-	@TableLogic(value = "0", delval = "1")
+
 	private Integer isDeleted;
 	/**
 	 * 供应商

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/ProjectGoodsFiles.java

@@ -103,7 +103,7 @@ public class ProjectGoodsFiles implements Serializable {
 	 * 是否已删除（0 否 1是）
 	 */
 	@ApiModelProperty(value = "是否已删除（0 否 1是）")
-	@TableLogic(value = "0", delval = "1")
+
 	private Integer isDeleted;
 
 	/**

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/QbProject.java

@@ -78,7 +78,7 @@ public class QbProject implements Serializable {
 	 * 是否已删除（0 否 1是）
 	 */
 	@ApiModelProperty(value = "是否已删除（0 否 1是）")
-	@TableLogic(value = "0", delval = "1")
+
 	private Integer isDeleted;
 	/**
 	 * 图片地址

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/QbProjectItem.java

@@ -81,7 +81,7 @@ public class QbProjectItem implements Serializable {
 	 * 是否已删除（0 否 1是）
 	 */
 	@ApiModelProperty(value = "是否已删除（0 否 1是）")
-	@TableLogic(value = "0", delval = "1")
+
 	private Integer isDeleted;
 	/**
 	 * 图片地址

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/extemalOrder/entity/ExternalOrder.java

@@ -78,7 +78,7 @@ public class ExternalOrder implements Serializable {
 	 * 是否已删除（0 否 1是）
 	 */
 	@ApiModelProperty(value = "是否已删除（0 否 1是）")
-	@TableLogic(value = "0", delval = "1")
+
 	private Integer isDeleted;
 	/**
 	 * 备注

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/extemalOrder/entity/ExternalOrderItem.java

@@ -76,7 +76,7 @@ public class ExternalOrderItem implements Serializable {
 	 * 是否已删除（0 否 1是）
 	 */
 	@ApiModelProperty(value = "是否已删除（0 否 1是）")
-	@TableLogic(value = "0", delval = "1")
+
 	private Integer isDeleted;
 	/**
 	 * 备注

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/maintenance/entity/Maintenance.java

@@ -184,7 +184,7 @@ public class Maintenance implements Serializable {
 	 * 是否已删除（0 否 1是）
 	 */
 	@ApiModelProperty(value = "是否已删除（0 否 1是）")
-	@TableLogic(value = "0", delval = "1")
+
 	private Integer isDeleted;
 	/**
 	 * 创建人

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/maintenance/entity/MaintenanceFees.java

@@ -115,7 +115,7 @@ public class MaintenanceFees implements Serializable {
 	 * 是否已删除（0 否 1是）
 	 */
 	@ApiModelProperty(value = "是否已删除（0 否 1是）")
-	@TableLogic(value = "0", delval = "1")
+
 	private Integer isDeleted;
 
 	/**

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/maintenance/entity/MaintenanceFiles.java

@@ -103,7 +103,7 @@ public class MaintenanceFiles implements Serializable {
 	 * 是否已删除（0 否 1是）
 	 */
 	@ApiModelProperty(value = "是否已删除（0 否 1是）")
-	@TableLogic(value = "0", delval = "1")
+
 	private Integer isDeleted;
 
 	/**

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/maintenance/entity/MaintenanceLog.java

@@ -73,7 +73,7 @@ public class MaintenanceLog implements Serializable {
 	 * 是否已删除（0 否 1是）
 	 */
 	@ApiModelProperty(value = "是否已删除（0 否 1是）")
-	@TableLogic(value = "0", delval = "1")
+
 	private Integer isDeleted;
 	/**
 	 * 创建人

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/record/entity/LimitRecord.java

@@ -70,7 +70,7 @@ public class LimitRecord implements Serializable {
 	 * 是否已删除（0 否 1是）
 	 */
 	@ApiModelProperty(value = "是否已删除（0 否 1是）")
-	@TableLogic(value = "0", delval = "1")
+
 	private Integer isDeleted;
 	/**
 	 * 租户id

blade-service/blade-pay/src/main/java/org/springblade/pay/tonglianPayment/utils/SybPayService.java

@@ -60,7 +60,11 @@ public class SybPayService {
 		params.put("reqsn", reqsn);
 		params.put("paytype", paytype);
 		params.put("randomstr", SybUtil.getValidatecode(8));
-		params.put("body", body);
+		if (ObjectUtils.isNotNull(body) && body.length() > 10) {
+			params.put("body", body.substring(0, 10));
+		} else {
+			params.put("body", body);
+		}
 		params.put("remark", remark);
 		params.put("validtime", validtime);
 		params.put("acct", acct);