7.26 app端 - 商户 - 商品管理

sp-service/level-one-server/src/main/java/com/pj/tb_goods_transit/TbGoodsTransit.java

@@ -76,6 +76,12 @@ public class TbGoodsTransit extends Model<TbGoodsTransit> implements Serializabl
 	 */
 	private String goodsUnits;
 
+	/** 互市区名称 */
+	private String tradeAreaName;
+
+	/** 互市区ID */
+	private Long tradeAreaId;
+
 	/**
 	 * 净重
 	 */

sp-service/level-one-server/src/main/java/com/pj/tb_goods_transit/TbGoodsTransitService.java

@@ -128,6 +128,12 @@ public class TbGoodsTransitService extends ServiceImpl<TbGoodsTransitMapper, TbG
 
 	/** app端 - 添加需要交易的商品 */
 	public boolean transactionGoods(TransactionGoodsParam transactionGoodsParam){
+		//判断商品的净重毛重
+		Double netWeight = transactionGoodsParam.getNetWeight();
+		Double grossWeight = transactionGoodsParam.getGrossWeight();
+		if(netWeight > grossWeight){
+			throw new RuntimeException("净重超过了毛重,请检查输入。");
+		}
 		//获取当前登录人 todo:生产阶段需打开该注释
 //		StpUserUtil.checkLogin();
 //		long loginIdAsLong = StpUserUtil.getLoginIdAsLong();

sp-service/level-one-server/src/main/java/com/pj/tb_goods_transit/param/TransactionGoodsParam.java

@@ -19,11 +19,17 @@ public class TransactionGoodsParam {
     /** 海关申报单号 */
     private String declareOdd;
 
+    /** 互市区名称 */
+    private String tradeAreaName;
+
+    /** 互市区ID */
+    private Long tradeAreaId;
+
     /** 价格 */
     private Double price;
 
     /** 净重 */
-    private Double newWeight;
+    private Double netWeight;
 
     /** 毛重 */
     private Double grossWeight;
@@ -33,7 +39,6 @@ public class TransactionGoodsParam {
 
     /** 监管商品的ID */
     @NotNull
-    @NotBlank
     private Long id;
 
     /** 当前添加商品的商户id */