Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

java110-bean/src/main/java/com/java110/dto/chargeMachine/ChargeMachineOrderDto.java

@@ -30,6 +30,9 @@ public class ChargeMachineOrderDto extends PageDto implements Serializable {
     private String chargeHours;
     private String startTime;
     private String endTime;
+
+    private String queryTime;
+
     private String state;
     private String personTel;
     private String communityId;
@@ -234,4 +237,12 @@ public class ChargeMachineOrderDto extends PageDto implements Serializable {
     public void setStateName(String stateName) {
         this.stateName = stateName;
     }
+
+    public String getQueryTime() {
+        return queryTime;
+    }
+
+    public void setQueryTime(String queryTime) {
+        this.queryTime = queryTime;
+    }
 }

java110-db/src/main/resources/mapper/common/ChargeMachineOrderV1ServiceDaoImplMapper.xml

@@ -68,6 +68,10 @@
         <if test="endTime !=null and endTime != ''">
             and t.end_time= #{endTime}
         </if>
+        <if test="queryTime !=null and queryTime != ''">
+            and t.start_time &lt; #{queryTime}
+            and t.end_time &gt; #{queryTime}
+        </if>
         <if test="state !=null and state != ''">
             and t.state= #{state}
         </if>

java110-db/src/main/resources/mapper/store/ContractServiceDaoImplMapper.xml

@@ -104,10 +104,10 @@
         <if test="endTime !=null ">
             and t.end_time &lt;= #{endTime}
         </if>
-        <if test="queryStartTime !=null">
+        <if test="queryStartTime !=null and queryStartTime != ''">
             and t.create_time &gt; #{queryStartTime}
         </if>
-        <if test="queryEndTime !=null">
+        <if test="queryEndTime !=null and queryEndTime != ''">
             and t.create_time &lt; #{queryEndTime}
         </if>
         <if test="state !=null and state != ''">
@@ -301,10 +301,10 @@
         <if test="endTime !=null ">
             and t.end_time &lt;= #{endTime}
         </if>
-        <if test="queryStartTime !=null">
+        <if test="queryStartTime !=null and queryStartTime != ''">
             and t.create_time &gt; #{queryStartTime}
         </if>
-        <if test="queryEndTime !=null">
+        <if test="queryEndTime !=null and queryEndTime != ''">
             and t.create_time &lt; #{queryEndTime}
         </if>
         <if test="state !=null and state != ''">

service-acct/src/main/java/com/java110/acct/payment/business/chargeCard/PreStoreChargeCardBusiness.java

@@ -0,0 +1,196 @@
+package com.java110.acct.payment.business.chargeCard;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.acct.payment.IPaymentBusiness;
+import com.java110.core.context.ICmdDataFlowContext;
+import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.doc.annotation.*;
+import com.java110.dto.account.AccountDto;
+import com.java110.dto.chargeMonthCard.ChargeMonthCardDto;
+import com.java110.dto.chargeMonthOrder.ChargeMonthOrderDto;
+import com.java110.dto.owner.OwnerDto;
+import com.java110.dto.payment.PaymentOrderDto;
+import com.java110.dto.user.UserDto;
+import com.java110.intf.acct.IAccountInnerServiceSMO;
+import com.java110.intf.common.IChargeMonthCardV1InnerServiceSMO;
+import com.java110.intf.common.IChargeMonthOrderV1InnerServiceSMO;
+import com.java110.intf.community.ICommunitySpacePersonTimeV1InnerServiceSMO;
+import com.java110.intf.community.ICommunitySpacePersonV1InnerServiceSMO;
+import com.java110.intf.community.ICommunitySpaceV1InnerServiceSMO;
+import com.java110.intf.user.IOwnerV1InnerServiceSMO;
+import com.java110.intf.user.IUserV1InnerServiceSMO;
+import com.java110.po.accountDetail.AccountDetailPo;
+import com.java110.po.chargeMonthOrder.ChargeMonthOrderPo;
+import com.java110.utils.exception.CmdException;
+import com.java110.utils.util.Assert;
+import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.DateUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+
+
+@Java110CmdDoc(title = "月卡充值",
+        description = "手机端月卡充值",
+        httpMethod = "post",
+        url = "http://{ip}:{port}/app/payment.unifiedPayment",
+        resource = "acctDoc",
+        author = "吴学文",
+        serviceCode = "payment.unifiedPayment.preStoreChargeCard",
+        seq = 1
+)
+
+@Java110ParamsDoc(params = {
+        @Java110ParamDoc(name = "business", length = 64, remark = "支付场景， preStoreOnline"),
+        @Java110ParamDoc(name = "payAdapt", length = 64, remark = "支付适配器，非必填"),
+        @Java110ParamDoc(name = "tradeType", length = 64, remark = "支付类型 NATIVE JSAPI APP"),
+        @Java110ParamDoc(name = "communityId", length = 30, remark = "小区ID"),
+        @Java110ParamDoc(name = "tradeType", length = 30, remark = "支付类型 NATIVE JSAPI APP"),
+        @Java110ParamDoc(name = "personTel", length = 30, remark = "手机号"),
+        @Java110ParamDoc(name = "cardId", length = 30, remark = "月卡ID"),
+        @Java110ParamDoc(name = "receivedAmount", length = 30, remark = "充值金额")
+
+})
+
+@Java110ResponseDoc(
+        params = {
+                @Java110ParamDoc(name = "code", type = "int", length = 11, defaultValue = "0", remark = "返回编号，0 成功 100 成功不需要唤起支付窗口，直接支付成功，可能从账户等做了扣款，其他失败"),
+                @Java110ParamDoc(name = "msg", type = "String", length = 250, defaultValue = "成功", remark = "描述"),
+        }
+)
+
+@Java110ExampleDoc(
+        reqBody = "{       \"business\":\"preStoreChargeCard\",\n" +
+                "         personName:\"张三\",\n" +
+                "         personTel:\"18909711111\",\n" +
+                "         cardId:\"18909711111\",\n" +
+                "         receivedAmount:\"100\",\n" +
+                "         communityId:\"123123\"" +
+                " }",
+        resBody = "{'code':0,'msg':'成功'}"
+)
+
+/**
+ * 场地预约
+ */
+@Service("preStoreChargeCard")
+public class PreStoreChargeCardBusiness implements IPaymentBusiness {
+
+
+    public static final String CODE_PREFIX_ID = "10";
+
+
+    @Autowired
+    private IChargeMonthOrderV1InnerServiceSMO chargeMonthOrderV1InnerServiceSMOImpl;
+
+    @Autowired
+    private IChargeMonthCardV1InnerServiceSMO chargeMonthCardV1InnerServiceSMOImpl;
+
+    @Autowired
+    private IOwnerV1InnerServiceSMO ownerInnerServiceSMOImpl;
+
+    @Autowired
+    private IUserV1InnerServiceSMO userV1InnerServiceSMOImpl;
+
+    /**
+     * @param context
+     * @param reqJson{ personName:"",
+     *                 personTel:"",
+     *                 appointmentTime:"",
+     *                 payWay:"",
+     *                 communityId:"",
+     *                 spaces:[{spaceId:'123',openTimes:[{hours:1},{hours:2}]}]
+     *                 }
+     * @return
+     */
+    @Override
+    public PaymentOrderDto unified(ICmdDataFlowContext context, JSONObject reqJson) {
+
+        //Assert.hasKeyAndValue(reqJson, "spaceId", "请求报文中未包含spaceId");
+        Assert.hasKeyAndValue(reqJson, "cardId", "请求报文中未包含cardId");
+        Assert.hasKeyAndValue(reqJson, "personTel", "请求报文中未包含personTel");
+        Assert.hasKeyAndValue(reqJson, "communityId", "请求报文中未包含communityId");
+
+        ChargeMonthCardDto chargeMonthCardDto = new ChargeMonthCardDto();
+        chargeMonthCardDto.setCardId(reqJson.getString("cardId"));
+        chargeMonthCardDto.setCommunityId(reqJson.getString("communityId"));
+        List<ChargeMonthCardDto> chargeMonthCardDtos = chargeMonthCardV1InnerServiceSMOImpl.queryChargeMonthCards(chargeMonthCardDto);
+
+        Assert.listOnlyOne(chargeMonthCardDtos, "月卡不存在");
+
+        PaymentOrderDto paymentOrderDto = new PaymentOrderDto();
+        paymentOrderDto.setOrderId(GenerateCodeFactory.getOId());
+        paymentOrderDto.setMoney(Double.parseDouble(chargeMonthCardDtos.get(0).getCardPrice()));
+        paymentOrderDto.setName("账户充值");
+
+        reqJson.put("receivableAmount", paymentOrderDto.getMoney());
+        reqJson.put("receivedAmount", paymentOrderDto.getMoney());
+        return paymentOrderDto;
+    }
+
+    @Override
+    public void notifyPayment(PaymentOrderDto paymentOrderDto, JSONObject reqJson) {
+
+        String cardId = reqJson.getString("cardId");
+        String communityId = reqJson.getString("communityId");
+        //查询 业主是否有账户
+        ChargeMonthCardDto chargeMonthCardDto = new ChargeMonthCardDto();
+        chargeMonthCardDto.setCardId(cardId);
+        chargeMonthCardDto.setCommunityId(communityId);
+        List<ChargeMonthCardDto> chargeMonthCardDtos = chargeMonthCardV1InnerServiceSMOImpl.queryChargeMonthCards(chargeMonthCardDto);
+
+        ChargeMonthOrderDto chargeMonthOrderDto = new ChargeMonthOrderDto();
+        chargeMonthOrderDto.setPersonTel(reqJson.getString("personTel"));
+        chargeMonthOrderDto.setQueryTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
+        chargeMonthOrderDto.setCardId(chargeMonthCardDtos.get(0).getCardId());
+        List<ChargeMonthOrderDto> chargeMonthOrderDtos = chargeMonthOrderV1InnerServiceSMOImpl.queryChargeMonthOrders(chargeMonthOrderDto);
+        Date startTime = null;
+        if (chargeMonthOrderDtos == null || chargeMonthOrderDtos.size() < 1) {
+            startTime = DateUtil.getCurrentDate();
+        } else {
+            startTime = DateUtil.getDateFromStringA(chargeMonthOrderDtos.get(0).getEndTime());
+        }
+
+        String endDate = DateUtil.getAddMonthStringA(startTime, reqJson.getIntValue("cardMonth"));
+
+        ChargeMonthOrderPo chargeMonthOrderPo = BeanConvertUtil.covertBean(reqJson, ChargeMonthOrderPo.class);
+        chargeMonthOrderPo.setOrderId(paymentOrderDto.getOrderId());
+        chargeMonthOrderPo.setStartTime(DateUtil.getFormatTimeString(startTime, DateUtil.DATE_FORMATE_STRING_A));
+        chargeMonthOrderPo.setEndTime(endDate);
+        chargeMonthOrderPo.setPrimeRate("5");
+        chargeMonthOrderPo.setCardId(chargeMonthCardDtos.get(0).getCardId());
+        chargeMonthOrderPo.setReceivableAmount(chargeMonthCardDtos.get(0).getCardPrice());
+        chargeMonthOrderPo.setReceivedAmount(chargeMonthCardDtos.get(0).getCardPrice());
+
+        chargeMonthOrderPo.setPersonName(getPersonName(reqJson));
+        int flag = chargeMonthOrderV1InnerServiceSMOImpl.saveChargeMonthOrder(chargeMonthOrderPo);
+
+        if (flag < 1) {
+            throw new CmdException("保存数据失败");
+        }
+    }
+
+
+    private String getPersonName(JSONObject reqJson) {
+
+        // todo 业主用 手机号查询
+        OwnerDto tmpOwnerDto = new OwnerDto();
+        tmpOwnerDto.setLink(reqJson.getString("personTel"));
+        tmpOwnerDto.setCommunityId(reqJson.getString("communityId"));
+        List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwners(tmpOwnerDto);
+        if (ownerDtos != null && ownerDtos.size() > 0) {
+            return ownerDtos.get(0).getName();
+        }
+
+        //todo 非业主是游客
+        UserDto userDto = new UserDto();
+        userDto.setTel(reqJson.getString("personTel"));
+        List<UserDto> userDtos = userV1InnerServiceSMOImpl.queryUsers(userDto);
+        if (userDtos != null && userDtos.size() > 0) {
+            return userDtos.get(0).getName();
+        }
+        throw new CmdException("业主不存在");
+    }
+}

service-common/src/main/java/com/java110/common/charge/ChargeCoreImpl.java

@@ -10,6 +10,8 @@ import com.java110.dto.chargeMachine.NotifyChargeOrderDto;
 import com.java110.dto.chargeMachine.ChargeMachineOrderCouponDto;
 import com.java110.dto.chargeMachine.ChargeMachinePortDto;
 import com.java110.dto.chargeMachine.ChargeRuleFeeDto;
+import com.java110.dto.chargeMonthOrder.ChargeMonthOrderDto;
+import com.java110.dto.user.UserDto;
 import com.java110.intf.acct.IAccountInnerServiceSMO;
 import com.java110.intf.common.*;
 import com.java110.po.accountDetail.AccountDetailPo;
@@ -60,6 +62,9 @@ public class ChargeCoreImpl implements IChargeCore {
     @Autowired
     private IChargeMachineOrderCouponV1InnerServiceSMO chargeMachineOrderCouponV1InnerServiceSMOImpl;
 
+    @Autowired
+    private IChargeMonthOrderV1InnerServiceSMO chargeMonthOrderV1InnerServiceSMOImpl;
+
 
     @Override
     public ResultVo startCharge(ChargeMachineDto chargeMachineDto, ChargeMachinePortDto chargeMachinePortDto, String chargeType, double duration, String orderId) {
@@ -103,10 +108,6 @@ public class ChargeCoreImpl implements IChargeCore {
         }
 
 
-        //订单退款 这里不操作，以设备 通知为主
-        // returnOrderMoney(chargeMachineDto, chargeMachinePortDto, "用户手工结束");
-
-
         return resultVo;
     }
 
@@ -114,24 +115,20 @@ public class ChargeCoreImpl implements IChargeCore {
      * 订单退款
      *
      * @param chargeMachineDto
-     * @param chargeMachinePortDto
      */
-    private void returnOrderMoney(ChargeMachineDto chargeMachineDto, ChargeMachinePortDto chargeMachinePortDto, String remark, String energy) {
+    private void returnOrderMoney(ChargeMachineDto chargeMachineDto,
+                                  String remark,
+                                  String energy,
+                                  List<ChargeMachineOrderDto> chargeMachineOrderDtos) {
         // 退款
-        ChargeMachineOrderDto chargeMachineOrderDto = new ChargeMachineOrderDto();
-        chargeMachineOrderDto.setMachineId(chargeMachineDto.getMachineId());
-        chargeMachineOrderDto.setPortId(chargeMachinePortDto.getPortId());
-        chargeMachineOrderDto.setState(ChargeMachineOrderDto.STATE_DOING);
-        List<ChargeMachineOrderDto> chargeMachineOrderDtos = chargeMachineOrderV1InnerServiceSMOImpl.queryChargeMachineOrders(chargeMachineOrderDto);
-
-        if (chargeMachineOrderDtos == null || chargeMachineOrderDtos.size() < 1) {
-            return;
-        }
-
-//        String chargeHours = chargeMachineOrderDtos.get(0).getChargeHours();
-//        double cHours = Double.parseDouble(chargeHours);
-//        if (999 == cHours) {
-//            cHours = 10;
+//        ChargeMachineOrderDto chargeMachineOrderDto = new ChargeMachineOrderDto();
+//        chargeMachineOrderDto.setMachineId(chargeMachineDto.getMachineId());
+//        chargeMachineOrderDto.setPortId(chargeMachinePortDto.getPortId());
+//        chargeMachineOrderDto.setState(ChargeMachineOrderDto.STATE_DOING);
+//        List<ChargeMachineOrderDto> chargeMachineOrderDtos = chargeMachineOrderV1InnerServiceSMOImpl.queryChargeMachineOrders(chargeMachineOrderDto);
+//
+//        if (chargeMachineOrderDtos == null || chargeMachineOrderDtos.size() < 1) {
+//            return;
 //        }
 
         Date startTime = DateUtil.getDateFromStringA(chargeMachineOrderDtos.get(0).getStartTime());
@@ -144,18 +141,18 @@ public class ChargeCoreImpl implements IChargeCore {
         String power = energy;
         if (usedHours < 0) {
             usedHours = 0;
-        }else{
-            BigDecimal powerDec = new BigDecimal(Double.parseDouble(energy)).divide(new BigDecimal(usedHours),2,BigDecimal.ROUND_HALF_UP);
-            power = powerDec.doubleValue()+"";
+        } else {
+            BigDecimal powerDec = new BigDecimal(Double.parseDouble(energy)).divide(new BigDecimal(usedHours), 2, BigDecimal.ROUND_HALF_UP);
+            power = powerDec.doubleValue() + "";
         }
 
         // todo 优惠券抵扣
         JSONObject result = useCoupon(usedHours, chargeMachineOrderDtos);
         usedHours = result.getDoubleValue("usedHours");
-        if(StringUtil.isEmpty(remark)) {
+        if (StringUtil.isEmpty(remark)) {
             remark = result.getString("remark");
-        }else{
-            remark = remark+";"+result.getString("remark");
+        } else {
+            remark = remark + ";" + result.getString("remark");
         }
 
         ChargeRuleFeeDto chargeRuleFeeDto = new ChargeRuleFeeDto();
@@ -245,6 +242,42 @@ public class ChargeCoreImpl implements IChargeCore {
         chargeMachineOrderAcctV1InnerServiceSMOImpl.saveChargeMachineOrderAcct(chargeMachineOrderAcctPo);
     }
 
+    public boolean ifMonthCard(String personTel, String communityId) {
+
+        ChargeMonthOrderDto chargeMonthOrderDto = new ChargeMonthOrderDto();
+        chargeMonthOrderDto.setPersonTel(personTel);
+        chargeMonthOrderDto.setCommunityId(communityId);
+        chargeMonthOrderDto.setQueryTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
+        List<ChargeMonthOrderDto> chargeMonthOrderDtos = chargeMonthOrderV1InnerServiceSMOImpl.queryChargeMonthOrders(chargeMonthOrderDto);
+        if (chargeMonthOrderDtos == null || chargeMonthOrderDtos.size() < 1) {
+            return false;
+        }
+
+        //todo 今天是否又充过电
+        ChargeMachineOrderDto chargeMachineOrderDto = new ChargeMachineOrderDto();
+        chargeMachineOrderDto.setPersonTel(personTel);
+        chargeMachineOrderDto.setCommunityId(communityId);
+        chargeMachineOrderDto.setQueryTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
+        List<ChargeMachineOrderDto> chargeMachineOrderDtos = chargeMachineOrderV1InnerServiceSMOImpl.queryChargeMachineOrders(chargeMachineOrderDto);
+
+        if (chargeMachineOrderDtos == null || chargeMachineOrderDtos.size() < 1) {
+            return true;
+        }
+
+
+        Date startTime = DateUtil.getDateFromStringA(chargeMachineOrderDtos.get(0).getStartTime());
+        Date endTime = DateUtil.getDateFromStringA(chargeMachineOrderDtos.get(0).getEndTime());
+
+
+        double usedHours = (endTime.getTime() - startTime.getTime()) / (60 * 60 * 1000.00);
+
+        if (usedHours < 1) {
+            return true;
+        }
+
+        return false;
+    }
+
     /**
      * 优惠券抵扣 小时
      *
@@ -354,11 +387,48 @@ public class ChargeCoreImpl implements IChargeCore {
         chargeMachinePortPo.setState(ChargeMachinePortDto.STATE_FREE);
         chargeMachinePortV1InnerServiceSMOImpl.updateChargeMachinePort(chargeMachinePortPo);
 
-        returnOrderMoney(chargeMachineDtos.get(0), chargeMachinePortDtos.get(0), notifyChargeOrderDto.getReason(), notifyChargeOrderDto.getEnergy());
+        ChargeMachineOrderDto chargeMachineOrderDto = new ChargeMachineOrderDto();
+        chargeMachineOrderDto.setMachineId(chargeMachineDto.getMachineId());
+        chargeMachineOrderDto.setPortId(chargeMachinePortDto.getPortId());
+        chargeMachineOrderDto.setState(ChargeMachineOrderDto.STATE_DOING);
+        List<ChargeMachineOrderDto> chargeMachineOrderDtos = chargeMachineOrderV1InnerServiceSMOImpl.queryChargeMachineOrders(chargeMachineOrderDto);
+
+        if (chargeMachineOrderDtos == null || chargeMachineOrderDtos.size() < 1) {
+            return new ResultVo(ResultVo.CODE_OK, "成功");
+        }
+
+        //todo 月卡直接修改状态
+        if (ifMonthCard(chargeMachineOrderDtos.get(0).getPersonTel(), chargeMachinePortDtos.get(0).getCommunityId())) {
+            finishMonthCardChargeOrder(notifyChargeOrderDto, chargeMachineOrderDtos);
+            return new ResultVo(ResultVo.CODE_OK, "成功");
+        }
+
+        returnOrderMoney(chargeMachineDtos.get(0), notifyChargeOrderDto.getReason(), notifyChargeOrderDto.getEnergy(),chargeMachineOrderDtos);
 
         return new ResultVo(ResultVo.CODE_OK, "成功");
     }
 
+    /**
+     * 结束月卡 充电订单
+     * @param notifyChargeOrderDto
+     * @param chargeMachineOrderDtos
+     */
+    private void finishMonthCardChargeOrder(NotifyChargeOrderDto notifyChargeOrderDto, List<ChargeMachineOrderDto> chargeMachineOrderDtos) {
+        ChargeMachineOrderPo chargeMachineOrderPo = new ChargeMachineOrderPo();
+        chargeMachineOrderPo.setOrderId(chargeMachineOrderDtos.get(0).getOrderId());
+        chargeMachineOrderPo.setRemark(notifyChargeOrderDto.getReason());
+        chargeMachineOrderPo.setState(ChargeMachineOrderDto.STATE_FINISH);
+        chargeMachineOrderPo.setAmount("0");
+        chargeMachineOrderPo.setEndTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
+        chargeMachineOrderPo.setCommunityId(chargeMachineOrderDtos.get(0).getCommunityId());
+        //chargeMachineOrderPo.setDurationPrice(durationPrice);
+        chargeMachineOrderPo.setEnergy(notifyChargeOrderDto.getEnergy());
+        int flag = chargeMachineOrderV1InnerServiceSMOImpl.updateChargeMachineOrder(chargeMachineOrderPo);
+        if (flag < 1) {
+            throw new IllegalArgumentException("修改订单失败");
+        }
+    }
+
     @Override
     public ResultVo workHeartbeat(NotifyChargeOrderDto notifyChargeOrderDto) {
 

service-common/src/main/java/com/java110/common/charge/IChargeCore.java

@@ -50,4 +50,6 @@ public interface IChargeCore {
      * @param chargeMachineDtos
      */
     void queryChargeMachineState(List<ChargeMachineDto> chargeMachineDtos);
+
+     boolean ifMonthCard(String personTel, String communityId);
 }

service-common/src/main/java/com/java110/common/cmd/chargeMachine/StartChargeCmd.java

@@ -13,6 +13,7 @@ import com.java110.dto.chargeMachine.ChargeMachineDto;
 import com.java110.dto.chargeMachine.ChargeMachineOrderDto;
 import com.java110.dto.chargeMachine.ChargeMachinePortDto;
 import com.java110.dto.chargeMachine.ChargeRuleFeeDto;
+import com.java110.dto.chargeMonthOrder.ChargeMonthOrderDto;
 import com.java110.dto.couponPool.CouponPropertyPoolConfigDto;
 import com.java110.dto.couponPool.CouponPropertyUserDto;
 import com.java110.dto.user.UserDto;
@@ -39,6 +40,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import java.math.BigDecimal;
 import java.text.ParseException;
 import java.util.Calendar;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -84,6 +86,9 @@ public class StartChargeCmd extends Cmd {
     @Autowired
     private IChargeMachineOrderCouponV1InnerServiceSMO chargeMachineOrderCouponV1InnerServiceSMOImpl;
 
+    @Autowired
+    private IChargeMonthOrderV1InnerServiceSMO chargeMonthOrderV1InnerServiceSMOImpl;
+
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
         Assert.hasKeyAndValue(reqJson, "communityId", "未包含小区信息");
@@ -139,6 +144,12 @@ public class StartChargeCmd extends Cmd {
 
         Assert.listOnlyOne(userDtos, "用户不存在");
 
+        //todo 如果是 月卡充值 ，后面不做校验
+        if (chargeCoreImpl.ifMonthCard(userDtos.get(0).getTel(), chargeMachinePortDtos.get(0).getCommunityId())) {
+            return;
+        }
+
+
         AccountDto accountDto = new AccountDto();
         accountDto.setLink(userDtos.get(0).getTel());
         accountDto.setAcctType(AccountDto.ACCT_TYPE_CASH);
@@ -254,6 +265,12 @@ public class StartChargeCmd extends Cmd {
         }
         resultVo.setData(orderId);
 
+        //todo 如果是 月卡充值 ，后面不做校验
+        if (chargeCoreImpl.ifMonthCard(userDtos.get(0).getTel(), chargeMachinePortDtos.get(0).getCommunityId())) {
+            monthCardOrder(reqJson, chargeMachineDtos, orderId, durationHours);
+            return;
+        }
+
 
         //todo 优惠券抵扣
         withholdCoupon(reqJson, chargeMachineDtos, orderId);
@@ -266,6 +283,34 @@ public class StartChargeCmd extends Cmd {
         context.setResponseEntity(ResultVo.createResponseEntity(resultVo));
     }
 
+    /**
+     * 月卡方式
+     *
+     * @param reqJson
+     * @param chargeMachineDtos
+     * @param orderId
+     * @param durationHours
+     */
+    private void monthCardOrder(JSONObject reqJson, List<ChargeMachineDto> chargeMachineDtos, String orderId, double durationHours) {
+
+        ChargeMachineOrderAcctPo chargeMachineOrderAcctPo = new ChargeMachineOrderAcctPo();
+        chargeMachineOrderAcctPo.setAcctDetailId("-1");
+        chargeMachineOrderAcctPo.setAmount("0");
+
+        chargeMachineOrderAcctPo.setCmoaId(GenerateCodeFactory.getGeneratorId("11"));
+        chargeMachineOrderAcctPo.setOrderId(orderId);
+        chargeMachineOrderAcctPo.setAcctId("-1");
+        chargeMachineOrderAcctPo.setStartTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
+        chargeMachineOrderAcctPo.setEndTime(DateUtil.getAddHoursStringA(DateUtil.getCurrentDate(), new Double(Math.ceil(durationHours)).intValue()));
+        chargeMachineOrderAcctPo.setRemark("月卡抵扣");
+        chargeMachineOrderAcctPo.setCommunityId(chargeMachineDtos.get(0).getCommunityId());
+        chargeMachineOrderAcctPo.setEnergy("0");
+        chargeMachineOrderAcctPo.setDurationPrice(reqJson.getString("durationPrice"));
+
+
+        chargeMachineOrderAcctV1InnerServiceSMOImpl.saveChargeMachineOrderAcct(chargeMachineOrderAcctPo);
+    }
+
     /**
      * 优惠券抵扣
      *
@@ -322,33 +367,11 @@ public class StartChargeCmd extends Cmd {
                 chargeMachineOrderCouponPo.setCmocId(GenerateCodeFactory.getGeneratorId("11"));
                 chargeMachineOrderCouponPo.setHours(value + "");
                 chargeMachineOrderCouponV1InnerServiceSMOImpl.saveChargeMachineOrderCoupon(chargeMachineOrderCouponPo);
-
-//                couponNames += ("优惠券名称：" + couponPropertyUserDtos.get(0).getCouponName() + "(" + couponId + "),小时："+value+";");
-//
-//                hours += value;
             } finally {
                 DistributedLock.releaseDistributedLock(requestId, key);
             }
         }
 
-//        hours = Math.ceil(hours);
-
-//        ChargeMachineOrderAcctPo chargeMachineOrderAcctPo = new ChargeMachineOrderAcctPo();
-//        chargeMachineOrderAcctPo.setAcctDetailId("-1");
-//        chargeMachineOrderAcctPo.setAmount("0");
-//        chargeMachineOrderAcctPo.setCmoaId(GenerateCodeFactory.getGeneratorId("11"));
-//        chargeMachineOrderAcctPo.setOrderId(orderId);
-//        chargeMachineOrderAcctPo.setAcctId(reqJson.getString("acctId"));
-//        chargeMachineOrderAcctPo.setStartTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
-//        chargeMachineOrderAcctPo.setEndTime(DateUtil.getAddHoursStringA(DateUtil.getCurrentDate(), new Double(hours).intValue()));
-//        chargeMachineOrderAcctPo.setRemark("优惠券抵扣," + couponNames);
-//        chargeMachineOrderAcctPo.setCommunityId(chargeMachineDtos.get(0).getCommunityId());
-//        chargeMachineOrderAcctPo.setEnergy("0");
-//        chargeMachineOrderAcctPo.setDurationPrice(reqJson.getString("durationPrice"));
-//
-//        chargeMachineOrderAcctV1InnerServiceSMOImpl.saveChargeMachineOrderAcct(chargeMachineOrderAcctPo);
-
-//        return hours;
     }
 
     /**