优化代码

service-acct/src/main/java/com/java110/acct/cmd/payment/CashierCmd.java

@@ -50,6 +50,7 @@ public class CashierCmd extends Cmd {
 
         Assert.hasKeyAndValue(reqJson, "business", "未包含业务");
         Assert.hasKeyAndValue(reqJson, "cashierUserId", "未包含收银人员");
+        Assert.hasKeyAndValue(reqJson, "openId", "未包含openId");
 
         context.getReqHeaders().put("user-id", reqJson.getString("cashierUserId"));
     }

service-acct/src/main/java/com/java110/acct/payment/business/oweFee/OweFeePaymentBusiness.java

@@ -103,6 +103,10 @@ public class OweFeePaymentBusiness implements IPaymentBusiness {
         BigDecimal feeTotalPrice = null;
         for (FeeDto tmpFeeDto : feeDtos) {
             try {
+                //todo 前端是否选择了
+                if (!hasInSelectFees(tmpFeeDto, reqJson)) {
+                    continue;
+                }
                 computeFeeSMOImpl.computeEveryOweFee(tmpFeeDto);//计算欠费金额
                 //如果金额为0 就排除
                 //if (tmpFeeDto.getFeePrice() > 0 && tmpFeeDto.getEndTime().getTime() <= DateUtil.getCurrentDate().getTime()) {
@@ -139,6 +143,33 @@ public class OweFeePaymentBusiness implements IPaymentBusiness {
         return paymentOrderDto;
     }
 
+    /**
+     * 判断是否是 选择的费用交费
+     *
+     * @param tmpFeeDto
+     * @param reqJson
+     * @return
+     */
+    private boolean hasInSelectFees(FeeDto tmpFeeDto, JSONObject reqJson) {
+
+        if (!reqJson.containsKey("feeIds")) {
+            return true;
+        }
+
+        JSONArray feeIds = reqJson.getJSONArray("feeIds");
+        if (feeIds == null || feeIds.size() < 1) {
+            return true;
+        }
+        boolean hasIn = false;
+        for (int feeIndex = 0; feeIndex < feeIds.size(); feeIndex++) {
+            if (tmpFeeDto.getFeeId().equals(feeIds.getString(feeIndex))) {
+                hasIn = true;
+            }
+        }
+
+        return hasIn;
+    }
+
     @Override
     public void notifyPayment(PaymentOrderDto paymentOrderDto, JSONObject reqJson) {
 

service-acct/src/main/java/com/java110/acct/smo/impl/QrCodePlutusPaymentAdapt.java

@@ -26,6 +26,8 @@ import java.util.TreeMap;
 
 /**
  * 微信支付
+ * WECHAT
+ * PAY_QR_ADAPT
  */
 @Service
 public class QrCodePlutusPaymentAdapt implements IQrCodePaymentSMO {