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

java110-bean/src/main/java/com/java110/dto/couponPropertyUser/CouponPropertyUserDto.java

@@ -18,6 +18,8 @@ public class CouponPropertyUserDto extends PageDto implements Serializable {
     public static final String STATE_WAIT = "1001";
     public static final String STATE_FINISH = "2002";
     public static final String TO_TYPE_PARKING = "4004"; //停车券
+
+    public static final String TO_TYPE_CHARGE = "5005"; //充电劵
     public static final String TO_TYPE_BUY = "1001"; //购物券
     public static final String TO_TYPE_BUY_INNER = "1011"; //购物券
     public static final String TO_TYPE_BUY_REPAIR = "3003"; //维修券

service-acct/src/main/java/com/java110/acct/cmd/couponProperty/CouponPropertyUserGiftCarCmd.java

@@ -88,6 +88,9 @@ public class CouponPropertyUserGiftCarCmd extends Cmd {
 
         String userId = context.getReqHeaders().get("user-id");
 
+        //前端车牌号输入问题处理 去除空格和小写
+        reqJson.put("carNum",reqJson.getString("carNum").trim().toUpperCase());
+
         //校验优惠券是否存在
         UserDto userDto = new UserDto();
         userDto.setUserId(userId);
@@ -141,6 +144,7 @@ public class CouponPropertyUserGiftCarCmd extends Cmd {
         String key = this.getClass().getSimpleName() + reqJson.getString("couponId");
         int flag = 0;
         List<CouponPropertyUserDto> couponPropertyUserDtos = null;
+        int giftCount = Integer.parseInt(reqJson.getString("giftCount"));
         try {
             CouponPropertyUserDto couponPropertyUserDto = new CouponPropertyUserDto();
             couponPropertyUserDto.setCouponId(reqJson.getString("couponId"));
@@ -159,7 +163,7 @@ public class CouponPropertyUserGiftCarCmd extends Cmd {
             }
 
             int stock = Integer.parseInt(couponPropertyUserDtos.get(0).getStock());
-            int giftCount = Integer.parseInt(reqJson.getString("giftCount"));
+
             if (stock < giftCount) {
                 throw new CmdException("优惠券不够赠送，当前数量为：" + stock);
             }
@@ -179,54 +183,55 @@ public class CouponPropertyUserGiftCarCmd extends Cmd {
             DistributedLock.releaseDistributedLock(requestId, key);
         }
 
-        //保存核销记录
-        String pccId = GenerateCodeFactory.getGeneratorId("11");
-
-        CouponPropertyUserDetailPo couponPropertyUserDetailPo = new CouponPropertyUserDetailPo();
-        couponPropertyUserDetailPo.setBusinessKey(pccId);
-        couponPropertyUserDetailPo.setCommunityId(reqJson.getString("communityId"));
-        couponPropertyUserDetailPo.setCouponId(couponPropertyUserDtos.get(0).getCouponId());
-        couponPropertyUserDetailPo.setCouponName(couponPropertyUserDtos.get(0).getCouponName());
-        couponPropertyUserDetailPo.setUoId(GenerateCodeFactory.getGeneratorId("11"));
-        couponPropertyUserDetailPo.setDetailType(couponPropertyUserDtos.get(0).getToType());
-        couponPropertyUserDetailPo.setRemark("赠送"+reqJson.getString("carNum")+"停车券");
-        flag = couponPropertyUserDetailV1InnerServiceSMOImpl.saveCouponPropertyUserDetail(couponPropertyUserDetailPo);
-        if (flag < 1) {
-            throw new CmdException("赠送失败");
-        }
-
-        CouponPropertyPoolConfigDto couponPropertyPoolConfigDto = new CouponPropertyPoolConfigDto();
-        couponPropertyPoolConfigDto.setCouponId(couponPropertyUserDtos.get(0).getCppId());
-        couponPropertyPoolConfigDto.setColumnKey("hours");
-        List<CouponPropertyPoolConfigDto> couponPropertyPoolConfigDtos = couponPropertyPoolConfigV1InnerServiceSMOImpl.queryCouponPropertyPoolConfigs(couponPropertyPoolConfigDto);
+        for(int giftIndex = 0; giftIndex < giftCount;giftIndex ++) {
+            //保存核销记录
+            String pccId = GenerateCodeFactory.getGeneratorId("11");
+
+            CouponPropertyUserDetailPo couponPropertyUserDetailPo = new CouponPropertyUserDetailPo();
+            couponPropertyUserDetailPo.setBusinessKey(pccId);
+            couponPropertyUserDetailPo.setCommunityId(reqJson.getString("communityId"));
+            couponPropertyUserDetailPo.setCouponId(couponPropertyUserDtos.get(0).getCouponId());
+            couponPropertyUserDetailPo.setCouponName(couponPropertyUserDtos.get(0).getCouponName());
+            couponPropertyUserDetailPo.setUoId(GenerateCodeFactory.getGeneratorId("11"));
+            couponPropertyUserDetailPo.setDetailType(couponPropertyUserDtos.get(0).getToType());
+            couponPropertyUserDetailPo.setRemark("赠送" + reqJson.getString("carNum") + "停车券");
+            flag = couponPropertyUserDetailV1InnerServiceSMOImpl.saveCouponPropertyUserDetail(couponPropertyUserDetailPo);
+            if (flag < 1) {
+                throw new CmdException("赠送失败");
+            }
 
-        Assert.listOnlyOne(couponPropertyPoolConfigDtos, "未包含优惠券配置信息");
+            CouponPropertyPoolConfigDto couponPropertyPoolConfigDto = new CouponPropertyPoolConfigDto();
+            couponPropertyPoolConfigDto.setCouponId(couponPropertyUserDtos.get(0).getCppId());
+            couponPropertyPoolConfigDto.setColumnKey("hours");
+            List<CouponPropertyPoolConfigDto> couponPropertyPoolConfigDtos = couponPropertyPoolConfigV1InnerServiceSMOImpl.queryCouponPropertyPoolConfigs(couponPropertyPoolConfigDto);
+
+            Assert.listOnlyOne(couponPropertyPoolConfigDtos, "未包含优惠券配置信息");
+
+            double value = Double.parseDouble(couponPropertyPoolConfigDtos.get(0).getColumnValue()) * 60;
+            value = Math.ceil(value);
+
+            ParkingCouponCarPo parkingCouponCarPo = new ParkingCouponCarPo();
+            parkingCouponCarPo.setPccId(pccId);
+            parkingCouponCarPo.setCouponId(reqJson.getString("couponId"));
+            parkingCouponCarPo.setCouponShopId(reqJson.getString("couponId"));
+            parkingCouponCarPo.setCommunityId(reqJson.getString("communityId"));
+            parkingCouponCarPo.setStartTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
+            parkingCouponCarPo.setEndTime(DateUtil.getAddDayString(DateUtil.getCurrentDate(), DateUtil.DATE_FORMATE_STRING_A, 1));
+            parkingCouponCarPo.setPaId(reqJson.getString("paId"));
+            parkingCouponCarPo.setState(ParkingCouponCarDto.STATE_WAIT);
+            parkingCouponCarPo.setTypeCd("1001"); // 时长赠送
+            parkingCouponCarPo.setGiveWay("4004"); //物业缴费赠送
+            parkingCouponCarPo.setValue(value + "");
+            parkingCouponCarPo.setCarNum(reqJson.getString("carNum"));
+            parkingCouponCarPo.setRemark(userDtos.get(0).getName() + "-" + userDtos.get(0).getTel() + "赠送");
+            parkingCouponCarPo.setShopId(userDtos.get(0).getUserId());
+
+            flag = parkingCouponCarV1InnerServiceSMOImpl.saveParkingCouponCar(parkingCouponCarPo);
 
-        double value = Double.parseDouble(couponPropertyPoolConfigDtos.get(0).getColumnValue()) * 60;
-        value = Math.ceil(value);
-
-        ParkingCouponCarPo parkingCouponCarPo = new ParkingCouponCarPo();
-        parkingCouponCarPo.setPccId(pccId);
-        parkingCouponCarPo.setCouponId(reqJson.getString("couponId"));
-        parkingCouponCarPo.setCouponShopId(reqJson.getString("couponId"));
-        parkingCouponCarPo.setCommunityId(reqJson.getString("communityId"));
-        parkingCouponCarPo.setStartTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
-        parkingCouponCarPo.setEndTime(DateUtil.getAddDayString(DateUtil.getCurrentDate(), DateUtil.DATE_FORMATE_STRING_A, 1));
-        parkingCouponCarPo.setPaId(reqJson.getString("paId"));
-        parkingCouponCarPo.setState(ParkingCouponCarDto.STATE_WAIT);
-        parkingCouponCarPo.setTypeCd("1001"); // 时长赠送
-        parkingCouponCarPo.setGiveWay("4004"); //物业缴费赠送
-        parkingCouponCarPo.setValue(value + "");
-        parkingCouponCarPo.setCarNum(reqJson.getString("carNum"));
-        parkingCouponCarPo.setRemark(userDtos.get(0).getName()+"-"+userDtos.get(0).getTel()+"赠送");
-        parkingCouponCarPo.setShopId(userDtos.get(0).getUserId());
-
-        flag = parkingCouponCarV1InnerServiceSMOImpl.saveParkingCouponCar(parkingCouponCarPo);
-
-        if (flag < 1) {
-            throw new CmdException("保存数据失败");
+            if (flag < 1) {
+                throw new CmdException("保存数据失败");
+            }
         }
-
         context.setResponseEntity(ResultVo.success());
 
 

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

@@ -1,5 +1,6 @@
 package com.java110.common.cmd.chargeMachine;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.java110.common.charge.IChargeCore;
 import com.java110.core.annotation.Java110Cmd;
@@ -13,8 +14,13 @@ import com.java110.dto.accountDetail.AccountDetailDto;
 import com.java110.dto.chargeMachine.ChargeMachineDto;
 import com.java110.dto.chargeMachineOrder.ChargeMachineOrderDto;
 import com.java110.dto.chargeMachinePort.ChargeMachinePortDto;
+import com.java110.dto.couponPropertyPoolConfig.CouponPropertyPoolConfigDto;
+import com.java110.dto.couponPropertyUser.CouponPropertyUserDto;
 import com.java110.dto.user.UserDto;
 import com.java110.intf.acct.IAccountInnerServiceSMO;
+import com.java110.intf.acct.ICouponPropertyPoolConfigV1InnerServiceSMO;
+import com.java110.intf.acct.ICouponPropertyUserDetailV1InnerServiceSMO;
+import com.java110.intf.acct.ICouponPropertyUserV1InnerServiceSMO;
 import com.java110.intf.common.IChargeMachineOrderAcctV1InnerServiceSMO;
 import com.java110.intf.common.IChargeMachineOrderV1InnerServiceSMO;
 import com.java110.intf.common.IChargeMachinePortV1InnerServiceSMO;
@@ -24,9 +30,12 @@ import com.java110.po.accountDetail.AccountDetailPo;
 import com.java110.po.chargeMachineOrder.ChargeMachineOrderPo;
 import com.java110.po.chargeMachineOrderAcct.ChargeMachineOrderAcctPo;
 import com.java110.po.chargeMachinePort.ChargeMachinePortPo;
+import com.java110.po.couponPropertyUser.CouponPropertyUserPo;
 import com.java110.utils.exception.CmdException;
+import com.java110.utils.lock.DistributedLock;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.DateUtil;
+import com.java110.utils.util.StringUtil;
 import com.java110.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -63,6 +72,14 @@ public class StartChargeCmd extends Cmd {
 
     @Autowired
     private IChargeMachineOrderAcctV1InnerServiceSMO chargeMachineOrderAcctV1InnerServiceSMOImpl;
+    @Autowired
+    private ICouponPropertyUserV1InnerServiceSMO couponPropertyUserV1InnerServiceSMOImpl;
+
+    @Autowired
+    private ICouponPropertyUserDetailV1InnerServiceSMO couponPropertyUserDetailV1InnerServiceSMOImpl;
+
+    @Autowired
+    private ICouponPropertyPoolConfigV1InnerServiceSMO couponPropertyPoolConfigV1InnerServiceSMOImpl;
 
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
@@ -125,6 +142,25 @@ public class StartChargeCmd extends Cmd {
 
         reqJson.put("acctId", accountDtos.get(0).getAcctId());
 
+        if (!reqJson.containsKey("couponIds") || StringUtil.isEmpty(reqJson.getString("couponIds"))) {
+            return;
+        }
+
+        for (String couponId : reqJson.getString("couponIds").split(",")) {
+            CouponPropertyUserDto couponPropertyUserDto = new CouponPropertyUserDto();
+            couponPropertyUserDto.setCouponId(couponId);
+            couponPropertyUserDto.setToType(CouponPropertyUserDto.TO_TYPE_CHARGE);
+            couponPropertyUserDto.setState(CouponPropertyUserDto.STATE_WAIT);
+
+            List<CouponPropertyUserDto> couponPropertyUserDtos = couponPropertyUserV1InnerServiceSMOImpl.queryCouponPropertyUsers(couponPropertyUserDto);
+
+            if (couponPropertyUserDtos == null || couponPropertyUserDtos.size() < 1) {
+                throw new CmdException("优惠券不存在");
+            }
+            if (!"Y".equals(couponPropertyUserDtos.get(0).getIsExpire())) {
+                throw new CmdException("优惠券已过期");
+            }
+        }
 
     }
 
@@ -200,10 +236,97 @@ public class StartChargeCmd extends Cmd {
             chargeCoreImpl.stopCharge(chargeMachineDtos.get(0), chargeMachinePortDtos.get(0));
             throw new CmdException("充电失败");
         }
+        resultVo.setData(orderId);
 
         //扣款
-        // todo 3.0 账户扣款
+        if (!reqJson.containsKey("couponIds") || StringUtil.isEmpty(reqJson.getString("couponIds"))) {
+            // todo 3.0 账户扣款
+            withholdAccount(reqJson, chargeMachineDtos, orderId);
+            context.setResponseEntity(ResultVo.createResponseEntity(resultVo));
+            return;
+        }
+
+        //todo 优惠券抵扣
+        withholdCoupon(reqJson, chargeMachineDtos, orderId);
+
+        context.setResponseEntity(ResultVo.createResponseEntity(resultVo));
+    }
 
+    /**
+     * 优惠券抵扣
+     *
+     * @param reqJson
+     * @param chargeMachineDtos
+     * @param orderId
+     */
+    private void withholdCoupon(JSONObject reqJson, List<ChargeMachineDto> chargeMachineDtos, String orderId) {
+        int flag;
+        double hours = 0;
+        String couponNames = "";
+        for (String couponId : reqJson.getString("couponIds").split(",")) {
+            String requestId = DistributedLock.getLockUUID();
+            String key = this.getClass().getSimpleName() + reqJson.getString("couponId");
+            try {
+                CouponPropertyUserDto couponPropertyUserDto = new CouponPropertyUserDto();
+                couponPropertyUserDto.setCouponId(couponId);
+                couponPropertyUserDto.setToType(CouponPropertyUserDto.TO_TYPE_CHARGE);
+                couponPropertyUserDto.setState(CouponPropertyUserDto.STATE_WAIT);
+
+                List<CouponPropertyUserDto> couponPropertyUserDtos = couponPropertyUserV1InnerServiceSMOImpl.queryCouponPropertyUsers(couponPropertyUserDto);
+                int stock = Integer.parseInt(couponPropertyUserDtos.get(0).getStock());
+                CouponPropertyUserPo couponPropertyUserPo = new CouponPropertyUserPo();
+                couponPropertyUserPo.setCouponId(couponPropertyUserDtos.get(0).getCouponId());
+                couponPropertyUserPo.setCommunityId(couponPropertyUserDtos.get(0).getCommunityId());
+                couponPropertyUserPo.setStock((stock - 1) + "");
+                if (stock == 1) {
+                    couponPropertyUserPo.setState(CouponPropertyUserDto.STATE_FINISH);
+                }
+                flag = couponPropertyUserV1InnerServiceSMOImpl.updateCouponPropertyUser(couponPropertyUserPo);
+                if (flag < 1) {
+                    throw new CmdException("核销失败");
+                }
+
+                couponNames += ("优惠券名称：" + couponPropertyUserDtos.get(0).getCouponName() + ",优惠券编号：" + couponId + ";");
+
+                CouponPropertyPoolConfigDto couponPropertyPoolConfigDto = new CouponPropertyPoolConfigDto();
+                couponPropertyPoolConfigDto.setCouponId(couponPropertyUserDtos.get(0).getCppId());
+                couponPropertyPoolConfigDto.setColumnKey("hours");
+                List<CouponPropertyPoolConfigDto> couponPropertyPoolConfigDtos = couponPropertyPoolConfigV1InnerServiceSMOImpl.queryCouponPropertyPoolConfigs(couponPropertyPoolConfigDto);
+
+                Assert.listOnlyOne(couponPropertyPoolConfigDtos, "未包含优惠券配置信息");
+
+                double value = Double.parseDouble(couponPropertyPoolConfigDtos.get(0).getColumnValue());
+                hours += value;
+            } finally {
+                DistributedLock.releaseDistributedLock(requestId, key);
+            }
+        }
+
+        hours = Math.ceil(hours);
+
+        ChargeMachineOrderAcctPo chargeMachineOrderAcctPo = new ChargeMachineOrderAcctPo();
+        chargeMachineOrderAcctPo.setAcctDetailId("-1");
+        chargeMachineOrderAcctPo.setAmount(chargeMachineDtos.get(0).getDurationPrice());
+        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");
+
+        chargeMachineOrderAcctV1InnerServiceSMOImpl.saveChargeMachineOrderAcct(chargeMachineOrderAcctPo);
+    }
+
+    /**
+     * 账户抵扣
+     *
+     * @param reqJson
+     * @param chargeMachineDtos
+     * @param orderId
+     */
+    private void withholdAccount(JSONObject reqJson, List<ChargeMachineDto> chargeMachineDtos, String orderId) {
         AccountDto accountDto = new AccountDto();
         accountDto.setAcctId(reqJson.getString("acctId"));
         List<AccountDto> accountDtos = accountInnerServiceSMOImpl.queryAccounts(accountDto);
@@ -229,9 +352,5 @@ public class StartChargeCmd extends Cmd {
         chargeMachineOrderAcctPo.setEnergy("0");
 
         chargeMachineOrderAcctV1InnerServiceSMOImpl.saveChargeMachineOrderAcct(chargeMachineOrderAcctPo);
-
-        resultVo.setData(orderId);
-
-        context.setResponseEntity(ResultVo.createResponseEntity(resultVo));
     }
 }

springboot/src/test/java/com/java110/AppTest.java

@@ -21,14 +21,11 @@ public class AppTest
      * Rigorous Test :-)
      */
     @Test
-    public void shouldAnswerWithTrue()
+    public void should()
     {
 
-        double amount = Double.parseDouble("0.6600");
-        System.out.println(amount);
+       String carNum = "青agk916 ";
 
-        BigDecimal amountBig = new BigDecimal(amount);
-        amount = amountBig.subtract(new BigDecimal(Double.parseDouble("0.6"))).doubleValue();
-        System.out.println(amount);
+        System.out.printf(carNum.trim().toUpperCase());
     }
 }