Merge remote-tracking branch 'origin/developerJ' into developerH

# Conflicts:
#	src/main/java/com/caimei/modules/newhome/web/NewPageFloorController.java
#	src/main/java/com/caimei/modules/order/service/NewOrderService.java
#	src/main/java/com/caimei/modules/product/entity/Product.java
#	src/main/resources/mappings/modules/product/ProductMapper.xml
#	src/main/webapp/WEB-INF/views/modules/newhome/newPageFloorList.jsp
#	src/main/webapp/WEB-INF/views/modules/order/cmPayShopList.jsp
#	src/main/webapp/WEB-INF/views/modules/product-new/productEdit.jsp

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

@@ -944,7 +944,7 @@ public class CmPayShopService extends CrudService<CmPayShopDao, CmPayShop> {
         BigDecimal waitPayShop = BigDecimal.ZERO;
         if (shopOrder != null) {
             payShopDifference.setPayStatus(shopOrder.getPayStatus());
-            waitPayShop = MathUtil.sub(shopOrder.getShouldPayShopAmount(), shopOrder.getPayedShopAmount());
+            waitPayShop = MathUtil.sub(shopOrder.getShouldPayShopAmount(), shopOrder.getDifferencePrice());
             NewCmShop shop = newCmShopDao.get(shopOrder.getShopID().toString());
             payShopDifference.setBankAccount(shop.getBankAccount());
             payShopDifference.setBankAccountName(shop.getBankAccountName());
@@ -1039,64 +1039,67 @@ public class CmPayShopService extends CrudService<CmPayShopDao, CmPayShop> {
 
         //待付供应商金额
         BigDecimal waitPayShop = MathUtil.sub(shopOrder.getShouldPayShopAmount(), shopOrder.getPayedShopAmount());
-        if (payShopDifference.getType() == 2 && MathUtil.compare(differencePrice, waitPayShop) > 0) {
-            //多付且差价大于待付金额,会发生供应商退款操作
-            BigDecimal waitRefund = MathUtil.sub(differencePrice, waitPayShop);
-            String refundWay = payShopDifference.getRefundWay();
-            BigDecimal refundAmount = payShopDifference.getRefundAmount();
-            BigDecimal refundBalanceAmount = payShopDifference.getRefundBalanceAmount();
-            if (refundWay.equals("1")) {
-                //线下退
-                refundBalanceAmount = BigDecimal.ZERO;
-            } else if (refundWay.equals("2")) {
-                //欠款账簿
-                refundAmount = BigDecimal.ZERO;
-            } else {
-                //两种方式都有
-                refundWay = "3";
-            }
-            logger.info("待付waitRefund>>>" + waitRefund + ">>>refundAmount金额>>>" + refundAmount + ">>>refundBalanceAmount金额>>>" + refundBalanceAmount);
-            if (MathUtil.compare(waitRefund, MathUtil.add(refundAmount, refundBalanceAmount)) == 0) {
-                CmRefundShop refundShop = new CmRefundShop();
-                refundShop.setShopID(shopOrder.getShopID().toString());
-                refundShop.setOperator(currentUser.getId());
-                refundShop.setOperatTime(time);
-                refundShop.setRefundWay(refundWay);
-                refundShop.setRefundAmount(refundAmount.doubleValue());
-                refundShop.setRefundBalanceAmount(refundBalanceAmount.doubleValue());
-                refundShop.setRefundType(payShopDifference.getRefundType().toString());
-                refundShop.setRemark(payShopDifference.getRemark());
-                refundShop.setDelFlag("0");
-                cmRefundShopDao.insert(refundShop);
+       Integer payWay= newShopOrderDao.payWay(shopOrderId);
+       if(payWay==1 && shopOrder.getShopReceiptStatus()==2) {
+           if (payShopDifference.getType() == 2 && MathUtil.compare(differencePrice, waitPayShop) > 0) {
+               //多付且差价大于待付金额,会发生供应商退款操作
+               BigDecimal waitRefund = MathUtil.sub(differencePrice, waitPayShop);
+               String refundWay = payShopDifference.getRefundWay();
+               BigDecimal refundAmount = payShopDifference.getRefundAmount();
+               BigDecimal refundBalanceAmount = payShopDifference.getRefundBalanceAmount();
+               if (refundWay.equals("1")) {
+                   //线下退
+                   refundBalanceAmount = BigDecimal.ZERO;
+               } else if (refundWay.equals("2")) {
+                   //欠款账簿
+                   refundAmount = BigDecimal.ZERO;
+               } else {
+                   //两种方式都有
+                   refundWay = "3";
+               }
+               logger.info("待付waitRefund>>>" + waitRefund + ">>>refundAmount金额>>>" + refundAmount + ">>>refundBalanceAmount金额>>>" + refundBalanceAmount);
+               if (MathUtil.compare(waitRefund, MathUtil.add(refundAmount, refundBalanceAmount)) == 0) {
+                   CmRefundShop refundShop = new CmRefundShop();
+                   refundShop.setShopID(shopOrder.getShopID().toString());
+                   refundShop.setOperator(currentUser.getId());
+                   refundShop.setOperatTime(time);
+                   refundShop.setRefundWay(refundWay);
+                   refundShop.setRefundAmount(refundAmount.doubleValue());
+                   refundShop.setRefundBalanceAmount(refundBalanceAmount.doubleValue());
+                   refundShop.setRefundType(payShopDifference.getRefundType().toString());
+                   refundShop.setRemark(payShopDifference.getRemark());
+                   refundShop.setDelFlag("0");
+                   cmRefundShopDao.insert(refundShop);
 
-                CmRefundShopRecord record = new CmRefundShopRecord();
-                record.setShopID(String.valueOf(shopOrder.getShopID()));
-                record.setShopOrderID(shopOrder.getShopOrderID().toString());
-                record.setShopOrderNo(shopOrder.getShopOrderNo());
-                record.setRefundType("5");
-                record.setRefundAmount(waitRefund.doubleValue());
-                record.setRefundTime(time);
-                record.setRefundShopID(refundShop.getId());
-                record.setDelFlag("0");
-                cmRefundShopRecordDao.insert(record);
-                payShopDifference.setRefundShopId(Integer.valueOf(refundShop.getId()));
+                   CmRefundShopRecord record = new CmRefundShopRecord();
+                   record.setShopID(String.valueOf(shopOrder.getShopID()));
+                   record.setShopOrderID(shopOrder.getShopOrderID().toString());
+                   record.setShopOrderNo(shopOrder.getShopOrderNo());
+                   record.setRefundType("5");
+                   record.setRefundAmount(waitRefund.doubleValue());
+                   record.setRefundTime(time);
+                   record.setRefundShopID(refundShop.getId());
+                   record.setDelFlag("0");
+                   cmRefundShopRecordDao.insert(record);
+                   payShopDifference.setRefundShopId(Integer.valueOf(refundShop.getId()));
 
-                //修改付供应商状态
-                newShopOrderDao.updatePayStatus(shopOrder.getShopOrderID(), "3");
-                List<NewShopOrder> shopOrders = newShopOrderDao.findListByOrderID(shopOrder.getOrderID());
-                AtomicBoolean isPayStatus = new AtomicBoolean(true);
-                shopOrders.forEach(s -> {
-                    if (!"3".equals(s.getPayStatus())) {
-                        isPayStatus.set(false);
-                    }
-                });
-                if (isPayStatus.get()) {
-                    newOrderDao.updatePayStatus("3", shopOrder.getOrderID());
-                }
-            } else {
-                throw new Exception("退款金额异常");
-            }
-        }
+                   //修改付供应商状态
+                   newShopOrderDao.updatePayStatus(shopOrder.getShopOrderID(), "3");
+                   List<NewShopOrder> shopOrders = newShopOrderDao.findListByOrderID(shopOrder.getOrderID());
+                   AtomicBoolean isPayStatus = new AtomicBoolean(true);
+                   shopOrders.forEach(s -> {
+                       if (!"3".equals(s.getPayStatus())) {
+                           isPayStatus.set(false);
+                       }
+                   });
+                   if (isPayStatus.get()) {
+                       newOrderDao.updatePayStatus("3", shopOrder.getOrderID());
+                   }
+               } else {
+                   throw new Exception("退款金额异常");
+               }
+           }
+       }
         payShopDifference.setModifyUserId(Integer.parseInt(UserUtils.getUser().getId()));
         cmPayShopRecordDao.insertDifference(payShopDifference);
         if (!("3".equals(shopOrder.getPayStatus()) && 1 == payShopDifference.getType())) {
@@ -1293,17 +1296,6 @@ public class CmPayShopService extends CrudService<CmPayShopDao, CmPayShop> {
                     newOrderDao.insertSettleRecord(settleRecord);
                     // 修改cm_split_account settlestatus
                     newOrderDao.updateSettleStatus(shopOrderId, 3);
-                    //计算供应商成本，结算金额，修改结算状态
-                    Double shouldPayShopAmount = newOrderDao.findShouldPayShopAmount(shopOrderId);
-                    //计算供应商成本，结算金额，修改结算状态
-                    Double settleSum = newOrderDao.findSettleSum(shopOrderId);
-                    if (shouldPayShopAmount > settleSum) {
-                        //成本>结算金额,部分结算
-                        newOrderDao.updateShopOrderSettleStatus(shopOrderId, 2);
-                    } else {
-                        //成本=结算金额 全部结算
-                        newOrderDao.updateShopOrderSettleStatus(shopOrderId, 3);
-                    }
                 }
                 //解锁
                 redisService.remove("SDJSS");

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

@@ -292,7 +292,8 @@ public class NewShopOrderService extends CrudService<NewShopOrderDao, NewShopOrd
             } else {
                 so.setReceiptStatus("1");
             }
-            Double receiptTotalFee = cmReceiptOrderRelationDao.findPayFeeByOrderID(so.getOrderID().toString());
+            double receiptTotalFee = cmReceiptOrderRelationDao.findPayFeeByOrderID(so.getOrderID().toString());
+
             so.setReceiptTotalFee(receiptTotalFee);
 
             //第一次收款收款时间

src/main/java/com/caimei/modules/product/entity/Product.java

@@ -579,6 +579,13 @@ public class Product extends DataEntity<Product> {
         this.priceFlag = priceFlag;
     }
 
+    public String getbeautyActFlag() {
+        return beautyActFlag;
+    }
+
+    public void setbeautyActFlag(String beautyActFlag) {
+        this.beautyActFlag = beautyActFlag;
+    }
 
     public String getLadderPriceFlag() {
         return ladderPriceFlag;

src/main/webapp/WEB-INF/views/modules/bulkpurchase/applyRefoundForm.jsp

@@ -826,7 +826,7 @@
                             </table>
                         </td>
                     </tr>
-                </c:forEach>
+
             </table>
         </c:if>
     <div class="form-actions">

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

@@ -505,7 +505,7 @@
                             <font color="black">${s.shouldPayShopAmount+s.differencePrice}</font><font color="red">(原应付：${s.shouldPayShopAmount},已补差价：${s.differencePrice})</font>
                         </c:if>
                         <c:if test="${s.differenceType eq 2 && s.differencePrice > 0}">
-                            <font color="black">${s.shouldPayShopAmount-s.differencePrice}</font><font color="red">(原应付：${s.shouldPayShopAmount}，已退差价：${s.differencePrice})</font>
+                            <font color="black"><fmt:formatNumber value="${s.shouldPayShopAmount-s.differencePrice}" type="number" pattern="#,##0.00"/></font><font color="red">(原应付：${s.shouldPayShopAmount}，已退差价：${s.differencePrice})</font>
                         </c:if>
                     </td>
                     <input type="hidden" class="payedShopAmount" value="${s.payedShopAmount}">
@@ -592,7 +592,7 @@
                 <a id="applyShopOtherFee" href="${ctx}/order/cmPayShop/shopOtherFeeForm?shopOrderId=${s.shopOrderID}">付第三方申请</a>
                 <c:if test="${s.paying ne '1' and s.payStatus eq '1' and !s.modifyPayable}">
                     <shiro:hasPermission name="order:cmPayShop:modifyPay">
-                        <a onclick="applypayWay(${s.shopReceiptStatus},${s.payWay});"  href="${ctx}/shopOrder/toChangePayShopAmount?shopOrderID=${s.shopOrderID}">修改成本</a>
+                        <a onclick="applypayWay(${s.shopReceiptStatus},${s.payWay})"  href="${ctx}/shopOrder/toChangePayShopAmount?shopOrderID=${s.shopOrderID}">修改成本</a>
                     </shiro:hasPermission>
                 </c:if>
                 <c:if test="${(s.modifyPayable and s.paying ne '1') || s.payStatus eq '2'}">
@@ -693,7 +693,6 @@
 <div class="pagination">${page}</div>
 
 <script>
-
     //线上支付的子订单不能直接修改成本
     function applypayWay(shopReceiptStatus,payWay) {
         console.log(payWay);
@@ -705,7 +704,6 @@
         }
     }
 
-
     (function () {
         var payTableEle = $('.pay-table'),
             payProductEle = $('.pay-product-item');

src/main/webapp/WEB-INF/views/modules/product-new/secondHand.jsp

@@ -263,7 +263,7 @@
                                 <%--                                   <a href="${ctx}/product/new/imageList?id=${product.id}&searchName=${searchName}&searchShopID=${searchShopID}&searchShopName=${searchShopName}&searchBigTypeID=${searchBigTypeID}&searchSmallTypeID=${searchSmallTypeID}&searchTinyTypeID=${searchTinyTypeID}&searchValidFlag=${searchValidFlag}&searchActStatus=${searchActStatus}&searchProductType=${searchProductType}&searchBrandID=${searchBrandID}&searchPreferredFlag=${searchPreferredFlag}&searchProductCategory=${searchProductCategory}">图片管理</a>--%>
                                 <%--待审核或审核未通过才需要审核（ 1待审核 2已上架 3已下架 8审核未通过 9已冻结）--%>
                             <c:if test="${product.validFlag eq 1 or product.validFlag eq 8}">
-                                <a class="red" href="javascript:void(0);" onclick="auditThisBySencodeProduct(${product.id},'${product.costPrice}')">审核</a>
+                                <a class="red" href="javascript:void(0);" onclick="auditThisBySencodeProduct(${product.id},'${product.costPrice}',${product.price})">审核</a>
                             </c:if>
                                 <%--已上架的才可以下架--%>
                             <c:if test="${product.validFlag eq 2}">