付第三方优化/佣金为0置为收付款注释

src/main/java/com/caimei/modules/order/entity/NewOrder.java

@@ -88,7 +88,7 @@ public class NewOrder extends DataEntity<NewOrder> {
     private String unReceipt;//未收金额(需要包含运费,目前只存在普通订单存在运费)
     private String paid;//已付金额(不需要包含运费,等同于订单商品金额)
     private String unpaid;//未付金额(不需要包含运费,等同于订单商品金额)
-    private String brokerage;//佣金
+    private Double brokerage;//佣金
     private String buyerName; //买家名称
     private String mobile; //手机
     private String address; //地址
@@ -624,11 +624,11 @@ public class NewOrder extends DataEntity<NewOrder> {
     }
 
     @Transient
-    public String getBrokerage() {
+    public Double getBrokerage() {
         return brokerage;
     }
 
-    public void setBrokerage(String brokerage) {
+    public void setBrokerage(Double brokerage) {
         this.brokerage = brokerage;
     }
 

src/main/java/com/caimei/modules/order/service/NewOrderService.java

@@ -35,8 +35,6 @@ import com.caimei.modules.user.service.CmUserBalanceRecordService;
 import com.caimei.modules.user.service.CmUserService;
 import com.caimei.modules.user.utils.ReturnedPurchaseStatus;
 import com.caimei.modules.user.utils.UserUtils;
-import com.caimei.po.CouponClub;
-import com.caimei.po.CouponRedemptionCode;
 import com.caimei.po.ProductLadderPrice;
 import com.caimei.po.neworder.CmShopOrder;
 import com.caimei.utils.*;
@@ -1825,6 +1823,7 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
                 order.setShopName(shopOrders.get(0).getShopName());
             }
             int count = 0;
+//            Double brokerage = 0d;
             for (NewShopOrder shopOrder : order.getNewShopOrders()) {
                 shopOrder.setOrderID(order.getOrderID());
                 shopOrder.setOrderNo(order.getOrderNo());
@@ -1836,7 +1835,6 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
                 if (shopOrder.getShopID() != 998) {
                     count++;
                 }
-
                 Integer shopOrderID = shopOrder.getShopOrderID();//子订单ID
                 //通过子订单ID查询子订单信息
                 NewShopOrder newShopOrder = newShopOrderDao.get(String.valueOf(shopOrderID));
@@ -1844,17 +1842,37 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
                     shopOrder.setFee(newShopOrder.getFee());
                     shopOrder.setShouldPayProduct(newShopOrder.getShouldPayProduct());
                     List<NewOrderProduct> pList = newOrderProductDao.findListByShopOrderID(shopOrderID);
-                    pList.forEach(orderProduct -> {
+//                    AtomicReference<Double> productBrokerage = new AtomicReference<>(0d);
+                    pList.forEach(p -> {
                         //充值定金商品
-                        if (6060 == orderProduct.getProductID()) {
+                        if (6060 == p.getProductID()) {
                             order.setRechargeGoods(1);
                         }
+                        Integer returnNum = newOrderProductDao.CountReturnedPurchaseProduct(newShopOrder.getShopOrderID(), p.getOrderProductID());
+                        returnNum = returnNum == null ? 0 : returnNum;
+                        p.setReturnedNum(returnNum);
+//                        Double price = p.getDiscountPrice();
+//                        if (null != p.getTouchPrice() && p.getTouchPrice() > 0d){
+//                            price = p.getTouchPrice();
+//                        }
+//                        double tempV = (price + p.getAddedValueTax() - p.getCostPrice() - p.getSingleShouldPayTotalTax()) * (p.getNum() + p.getPresentNum() - p.getReturnedNum());
+//                        productBrokerage.updateAndGet(v -> v + tempV);
                     });
+//                    if (newShopOrder.getShopPostFee() == null) {
+//                        newShopOrder.setShopPostFee(0D);
+//                    }
+//                    if (newShopOrder.getShopOtherFee() == null) {
+//                        newShopOrder.setShopOtherFee(0D);
+//                    }
+//                    double shopBrokerage = productBrokerage.get() - newShopOrder.getShopOtherFee() - newShopOrder.getShopPostFee();
+//                    newShopOrder.setBrokerage(shopBrokerage);
+//                    brokerage += newShopOrder.getBrokerage();
                 } else {
                     shopOrder.setFee(0d);
                     shopOrder.setShouldPayProduct(0d);
                 }
             }
+//            order.setBrokerage(brokerage);
             //一个子订单只有一个商品时,不可拆分
             if (order.getProductCount() == null) {
                 order.setProductCount(1);

src/main/webapp/WEB-INF/views/modules/order/checkPaymentOrder.jsp

@@ -565,16 +565,16 @@
                                 <%--                                <font color="red">(需退差价￥${so.differencePrice})</font>--%>
                                 <%--                            </c:if>--%>
 
-                            <c:if test="${s.differenceType ne 1 && s.differenceType ne 2 }">
-                                <font color="#E15616"><fmt:formatNumber value="${s.shouldPayShopAmount}" type="number"
+                            <c:if test="${so.differenceType ne 1 && so.differenceType ne 2 }">
+                                <font color="#E15616"><fmt:formatNumber value="${so.shouldPayShopAmount}" type="number"
                                                                         pattern="#,##0.00"/></font>
                             </c:if>
-                            <c:if test="${s.differenceType eq 1 && s.differencePrice > 0}">
-                                <font color="red">${s.shouldPayShopAmount-s.differencePrice}(原应付：${s.shouldPayShopAmount},已退差价：${s.differencePrice})</font>
+                            <c:if test="${so.differenceType eq 1 && so.differencePrice > 0}">
+                                <font color="red">${so.shouldPayShopAmount-so.differencePrice}(原应付：${so.shouldPayShopAmount},已退差价：${so.differencePrice})</font>
                             </c:if>
 
-                            <c:if test="${s.differenceType eq 2 && s.differencePrice > 0}">
-                                <font color="red">${s.shouldPayShopAmount+s.differencePrice}(原应付：${s.shouldPayShopAmount}，已补差价：${s.differencePrice})</font>
+                            <c:if test="${so.differenceType eq 2 && so.differencePrice > 0}">
+                                <font color="red">${so.shouldPayShopAmount+so.differencePrice}(原应付：${so.shouldPayShopAmount}，已补差价：${so.differencePrice})</font>
                             </c:if>
 
                         </td>

src/main/webapp/WEB-INF/views/modules/order/newOrderList.jsp

@@ -1112,13 +1112,12 @@
 
 
                     <shiro:hasPermission name="order:order:edit">
+
                         <%--brokerage佣金等于0判断，这里佣金是虚拟字段--%>
-                        <c:if test="${(order.rebateOrder == 1 )}">
-                            <c:if test="${(order.brokerage eq 0)}">
-                                <a href="${ctx}/order/toChangePay?id=${order.orderID}"
-                                   onclick="return confirmx('确定将该返佣订单直接置为已收款和已付款状态吗？', this.href)">置为已收款已付款</a>
-                            </c:if>
-                        </c:if>
+<%--                        <c:if test="${(order.rebateOrder == 1 ) && order.brokerage <= 0}">--%>
+<%--                                <a href="${ctx}/order/toChangePay?id=${order.orderID}"--%>
+<%--                                   onclick="return confirmx('确定将该返佣订单直接置为已收款和已付款状态吗？', this.href)">置为已收款已付款</a>--%>
+<%--                        </c:if>--%>
 
 
                         <c:if test="${order.organizeID == 0}">