소스 검색

申请付款页线上付款置灰勾选框

zhijiezhao 3 년 전
부모
커밋
f4f91aaae6

+ 2 - 0
src/main/java/com/caimei/modules/order/dao/NewOrderDao.java

@@ -238,4 +238,6 @@ public interface NewOrderDao extends CrudDao<NewOrder> {
     void updateOrderByPayStatus(@Param("orderId")Integer orderId, @Param("payStatus")Integer payStatus);
 
     void updateBySplitStatus(String mbOrderId);
+
+    Integer findOnlinePay(Integer orderID);
 }

+ 9 - 0
src/main/java/com/caimei/modules/order/entity/NewShopOrder.java

@@ -14,6 +14,7 @@ import java.util.List;
  * @description 子订单表
  */
 public class NewShopOrder extends DataEntity<NewShopOrder> {
+    private Integer onlineFlag;    //是否线上支付过1是,0否
     private Double couponAmount;   //母订单使用优惠券金额
     private Integer shopOrderID;//        int(11) not null auto_increment comment '子订单ID',
     private Integer organizeID;//        组织Id
@@ -159,6 +160,14 @@ public class NewShopOrder extends DataEntity<NewShopOrder> {
         this.income = income;
     }
 
+    public Integer getOnlineFlag() {
+        return onlineFlag;
+    }
+
+    public void setOnlineFlag(Integer onlineFlag) {
+        this.onlineFlag = onlineFlag;
+    }
+
     public List<String> getShopOrderNos() {
         return shopOrderNos;
     }

+ 2 - 0
src/main/java/com/caimei/modules/order/service/NewShopOrderService.java

@@ -277,6 +277,8 @@ public class NewShopOrderService extends CrudService<NewShopOrderDao, NewShopOrd
 
     public void setValue(List<NewShopOrder> payOrderList){
         for (NewShopOrder so : payOrderList) {
+            Integer onlineFlag=newOrderDao.findOnlinePay(so.getOrderID())>0?1:0;
+            so.setOnlineFlag(onlineFlag);
             //统计该子订单的主的收款金额和收款状态
             NewOrder newOrder = newOrderDao.get(so.getOrderID().toString());
             if (null != newOrder) {

+ 7 - 0
src/main/resources/mappings/modules/order/OrderMapper.xml

@@ -1316,6 +1316,13 @@
         FROM cm_pay_shop_record
         WHERE STATUS = 1 AND delFlag = 0 AND shopOrderID = #{shopOrderId}
     </select>
+    <select id="findOnlinePay" resultType="java.lang.Integer">
+        SELECT COUNT(*) FROM
+        cm_receipt_order_relation cror
+        LEFT JOIN cm_discern_receipt cdr ON cdr.id = receiptID
+        WHERE cdr.payWay=1
+          AND cror.orderID=#{orderID}
+    </select>
     <insert id="insertSplitAccount">
         INSERT INTO cm_split_account (orderId, productId, orderProductId, shopId, couponRecordId, vipRecordId,
                                       authVipRecordId, type, subUserNo, splitAccount,

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

@@ -373,7 +373,7 @@
                                 已付款
                             </c:if>
                             <c:if test="${s.paying ne '1' && s.payStatus ne '3' }">
-                                <input type="checkbox" ${s.status eq 7 ?'disabled':''}
+                                <input type="checkbox" ${s.status eq 7 || s.onlineFlag>0 ?'disabled':''}
                                        data-shoporderid="${s.shopOrderID}" data-shopid="${s.shopID}" data-isPayShopOtherFee="${s.payShopOtherFee}"/>
                             </c:if>
                         </c:if>