Merge remote-tracking branch 'origin/release-201827-wangcz' into release-201827-wangcz

src/main/java/com/uas/platform/b2c/external/erp/order/api/OrderController.java

@@ -441,4 +441,29 @@ public class OrderController {
 		return orderService.findUserVenderByCode(orderid);
 	}
 
+	/**
+	 * 统计个人的订单金额(只包含520-405)
+	 * @param useruu 个人uu
+	 * @param enuu 企业uu
+	 * @param starttime 开始时间
+	 * @param endtime 结束时间
+	 * @return  ResultMap
+	 */
+	@RequestMapping(value = "/trading/volume/personal", method = RequestMethod.GET)
+	public ResultMap statisticsPersonTradingVolume(Long useruu, Long enuu, Long starttime, Long endtime) {
+		return orderService.statisticsPersonTradingVolume(useruu, enuu, starttime, endtime);
+	}
+
+	/**
+	 * 统计企业的订单金额总计 (只包含520-405)
+	 * @param enuu
+	 * @param starttime
+	 * @param endtime
+	 * @return ResultMap
+	 */
+	@RequestMapping(value = "/trading/volume", method = RequestMethod.GET)
+	public ResultMap statisticsEnterpriseTradingVolume(Long enuu, Long starttime, Long endtime) {
+		return orderService.statisticsEnterpriseTradingVolume(enuu, starttime, endtime);
+	}
+
 }

src/main/java/com/uas/platform/b2c/logistics/service/impl/InvoiceServiceImpl.java

@@ -653,6 +653,9 @@ public class InvoiceServiceImpl implements InvoiceService {
             if (invoice == null) {
                 throw new IllegalOperatorException("没有传入有效的订单信息");
             }
+            if (invoice.getStatus().intValue() != Status.INBOUND.value()) {
+                return ResultMap.success("");
+            }
             User user = SystemSession.getUser();
             Long useruu = null;
             if (user == null) {

src/main/java/com/uas/platform/b2c/prod/commodity/model/InOutboundDetail.java

@@ -3,8 +3,6 @@ package com.uas.platform.b2c.prod.commodity.model;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.uas.platform.b2c.logistics.model.InvoiceDetail;
-import com.uas.platform.b2c.logistics.model.InvoiceFOrderDetail;
-import com.uas.platform.b2c.logistics.model.InvoiceFPurchaseDetail;
 import com.uas.platform.b2c.trade.order.model.PurchaseDetail;
 
 import javax.persistence.*;
@@ -286,7 +284,7 @@ public class InOutboundDetail implements Serializable {
         this.cmpuuid = detail.getUuid();
         this.spec = detail.getSpec();
         this.qty = detail.getQty();
-        this.price = detail.getPrice();
+        this.price = detail.getTaxUnitprice();
         this.productId = detail.getProductid();
         this.sourceid = detail.getId();
         this.currency = detail.getCurrency();

src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/GoodsServiceImpl.java

@@ -4030,21 +4030,9 @@ public class GoodsServiceImpl implements GoodsService {
                 goods.setMinPackQty(product.getMinPackQty());
                 goods.setPackaging(product.getPackaging());
                 goods.setMinBuyQty();
+                goods.setPerQty();
                 goods.adjustFragmentPrice();
-                if (goods.getAutoPublish() == null) {
-                    goods.setAutoPublish(Boolean.TRUE);
-                }
-                if (goods.getAutoPublish()) {
-                    if (StringUtils.isEmpty(goods.getPackaging()) || StringUtils.isEmpty(goods.getProduceDate()) || (goods.getMinBuyQty() == null) || (goods.getMinPackQty() == null) || (goods.getB2cMaxDelivery() == null) || (goods.getB2cMinDelivery() == null) || StringUtils.isEmpty(goods.getQtyPrice())) {
-                        //做未上架处理
-                        goods.setStatus(Status.NO_SHELVE.value());
-                    } else {
-                        //如果信息填写全，默认上架
-                        goods.setStatus((NumberUtil.compare(goods.getReserve(), goods.getMinBuyQty()) > -1) ? Status.AVAILABLE.value() : Status.UNAVAILABLE.value());
-                    }
-                } else {
-                    goods.setStatus(Status.NO_SHELVE.value());
-                }
+                goods.setStatus();
                 GoodsHistory history = goodsHistoryService.converTGoodsHist(goods, GoodsHistory.OperateType.Update.getPhrase(), false);
                 list.add(history);
             }

src/main/java/com/uas/platform/b2c/trade/order/controller/OrderController.java

@@ -984,29 +984,4 @@ public class OrderController {
 	public ResultMap findInvoiceByIdAndInvoiceId(Long id, String invoiceid) {
 		return orderService.findInvoiceByIdAndInvoiceId(id, invoiceid);
 	}
-
-	/**
-	 * 统计个人的订单金额(只包含520-405)
-	 * @param useruu 个人uu
-	 * @param enuu 企业uu
-	 * @param starttime 开始时间
-	 * @param endtime 结束时间
-	 * @return  ResultMap
-	 */
-	@RequestMapping(value = "/trading/volume/personal", method = RequestMethod.GET)
-	public ResultMap statisticsPersonTradingVolume(Long useruu, Long enuu, Long starttime, Long endtime) {
-		return orderService.statisticsPersonTradingVolume(useruu, enuu, starttime, endtime);
-	}
-
-	/**
-	 * 统计企业的订单金额总计 (只包含520-405)
-	 * @param enuu
-	 * @param starttime
-	 * @param endtime
-	 * @return ResultMap
-	 */
-	@RequestMapping(value = "/trading/volume", method = RequestMethod.GET)
-	public ResultMap statisticsEnterpriseTradingVolume(Long enuu, Long starttime, Long endtime) {
-		return orderService.statisticsEnterpriseTradingVolume(enuu, starttime, endtime);
-	}
 }