修改付款按钮的显示

base-module/src/main/java/com/caimei/module/base/entity/po/CmDiscernReceipt.java

@@ -14,7 +14,7 @@ public class CmDiscernReceipt implements Serializable {
     private Long id;
 
     /**
-     * 用户付款方式：1线上，2线下
+     * 用户付款方式：1线上，2线下，3余额抵扣
      */
     private String payWay;
 

pay/src/main/java/com/caimei/module/pay/service/impl/PayServiceImpl.java

@@ -67,10 +67,12 @@ public class PayServiceImpl implements PayService {
         BigDecimal receiptAmount = BigDecimal.ZERO;
         if (null != discernReceiptList && discernReceiptList.size() > 0) {
             for (DiscernReceiptVo discernReceipt : discernReceiptList) {
-                receiptAmount = receiptAmount.add(discernReceipt.getAssociateAmount());
                 if ("2".equals(discernReceipt.getPayWay())) {
                     return model.error("线下支付过只能走线下");
                 }
+                if ("3".equals(discernReceipt.getReceiptStatus())) {
+                    receiptAmount = receiptAmount.add(discernReceipt.getAssociateAmount());
+                }
             }
         }
         order.setReceiptAmount(receiptAmount);

pay/src/main/resources/com-caimei-module-pay/PayMapper.xml

@@ -31,6 +31,7 @@
           AND cror.delFlag = '0'
           AND cdr.delFlag = '0'
           AND cdr.payType != '16'
+          AND cdr.receiptStatus IN(2,3)
         ORDER BY
           cdr.receiptDate DESC
     </select>