合并分支 'dev' 到 'test'

fix:订单、退货单导入价格正负校验



查看合并请求 !61

@@ -503,6 +503,15 @@ func (dividendsOrderService *DividendsOrderService) ImportDividendsOrder(importD
 						myRow = append(myRow, tmpRow)
 						myRow = append(myRow, tmpRow)
 						continue
 						continue
 					}
 					}
+					//	 正负判断
+					if univalent < 0 {
+						tmpRow := &domain.FailInfo{
+							FailReason: "产品价格必须大于0，请重新填写",
+						}
+						tmpRow.ImportDividendsOrderData = &dividendsOrder
+						myRow = append(myRow, tmpRow)
+						continue
+					}
 				}
 				}
 			case 7: // 费用校验
 			case 7: // 费用校验
 				{
 				{

@@ -554,6 +554,16 @@ func (dividendsReturnedOrderService *DividendsReturnedOrderService) ImportDivide
 						myRow = append(myRow, tmpRow)
 						myRow = append(myRow, tmpRow)
 						continue
 						continue
 					}
 					}
+
+					//	 正负判断
+					if univalent < 0 {
+						tmpRow := &domain.FailReturnedInfo{
+							FailReason:                       "退货价格必须大于0，请重新填写",
+							ImportDividendsReturnedOrderData: &dividendsReturnedOrder,
+						}
+						myRow = append(myRow, tmpRow)
+						continue
+					}
 				}
 				}
 			}
 			}
 		}
 		}