no message

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/base/WebsitGoodsPVO.java

@@ -63,11 +63,11 @@ public class WebsitGoodsPVO {
     @ApiModelProperty(value = "收费标准")
     private BigDecimal normAmount;
 
-    @ApiModelProperty(value = "自有库存师傅分账金额(师傅分账比例)")
-    private BigDecimal selfWorkerAmount;
-
-    @ApiModelProperty(value = "自有库存商户分账金额(商户分账比例)")
-    private BigDecimal selfWebsitAmount;
+//    @ApiModelProperty(value = "自有库存师傅分账金额(师傅分账比例)")
+//    private BigDecimal selfWorkerAmount;
+//
+//    @ApiModelProperty(value = "自有库存商户分账金额(商户分账比例)")
+//    private BigDecimal selfWebsitAmount;
 
     @ApiModelProperty(value = "创建人")
     private String createBy;

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/base/WebsitNormChargeVO.java

@@ -56,15 +56,6 @@ public class WebsitNormChargeVO {
     @ApiModelProperty(value = "收费标准")
     private BigDecimal normAmount;
 
-    @ApiModelProperty(value = "自有库存师傅分账金额")
-    private BigDecimal selfWorkerAmount;
-
-    @ApiModelProperty(value = "自有库存商户分账金额")
-    private BigDecimal selfWebsitAmount;
-
-    @ApiModelProperty(value = "师傅手工费用")
-    private BigDecimal manualAmount;
-
     @ApiModelProperty(value = "状态")
     private StateEnum status;
 

mall-server-api/src/main/java/com/gree/mall/manager/logic/material/base/NormChargeLogic.java

@@ -147,21 +147,21 @@ public class NormChargeLogic {
 //            BigDecimal outWorkerAmount = BigDecimal.ZERO;
 //            BigDecimal outWebsitAmount = BigDecimal.ZERO;
 
-            if (bean.getSelfWorkerAmount().compareTo(BigDecimal.ZERO) > 0) {
-                if (bean.getSelfWorkerAmount().compareTo(bean.getNormAmount()) > 0) {
-                    if (bean.getNormType().equals(NormTypeEnum.M.getKey())) {
-                        throw new RemoteServiceException("自有库存师傅分账金额不能大于收费标准");
-                    } else {
-                        throw new RemoteServiceException("师傅分账金额不能大于收费标准");
-                    }
-                }
+//            if (bean.getSelfWorkerAmount().compareTo(BigDecimal.ZERO) > 0) {
+//                if (bean.getSelfWorkerAmount().compareTo(bean.getNormAmount()) > 0) {
+//                    if (bean.getNormType().equals(NormTypeEnum.M.getKey())) {
+//                        throw new RemoteServiceException("自有库存师傅分账金额不能大于收费标准");
+//                    } else {
+//                        throw new RemoteServiceException("师傅分账金额不能大于收费标准");
+//                    }
+//                }
 
 //                selWorkerAmount = bean.getSelfWorkerAmount();
                 selWorkerAmount = bean.getNormAmount();
                 selWebsitAmount = bean.getNormAmount().subtract(selWorkerAmount);
-            } else {
-                selWebsitAmount = bean.getNormAmount();
-            }
+//            } else {
+//                selWebsitAmount = bean.getNormAmount();
+//            }
 
 //            if (bean.getOutWorkerAmount().compareTo(BigDecimal.ZERO) > 0) {
 //                if (bean.getOutWorkerAmount().compareTo(bean.getNormAmount()) > 0) {

mall-server-api/src/main/java/com/gree/mall/manager/logic/material/base/WebsitGoodsLogic.java

@@ -190,10 +190,10 @@ public class WebsitGoodsLogic {
 
     private void stockUnitEmptyAdd(WebsitGoods goods) {
         if (goods.getGoodsType().equals(WebsitGoodsTypeEnum.M.getKey())) {
-            if (StringUtils.isNotBlank(goods.getGoodsStockUnit())) {
+            if (StringUtils.isBlank(goods.getGoodsStockUnit())) {
                 throw new RemoteServiceException("库存单位不能为空");
             }
-            if (StringUtils.isNotBlank(goods.getGoodsSalesUnit())) {
+            if (StringUtils.isBlank(goods.getGoodsSalesUnit())) {
                 throw new RemoteServiceException("销售单位不能为空");
             }
         }
@@ -624,7 +624,7 @@ public class WebsitGoodsLogic {
             String brandStr = (String) row.get(4);
             String categoryStr = (String) row.get(5);
 //            String selfAmountStr = (String) row.get(6);
-            String partType = (String) row.get(7);
+            String partType = (String) row.get(6);
             String goodsCodeStr = (String) row.get(7);
             String remark = (String) row.get(8);