提交

CODE/smart-community/app-api/src/main/java/com/community/huiju/config/BillQuartz.java

@@ -0,0 +1,49 @@
+package com.community.huiju.config;
+
+import com.community.huiju.dao.TpBillInvoiceMapper;
+import com.community.huiju.dao.TpBillOrderMapper;
+import com.community.huiju.model.TpBillInvoice;
+import com.community.huiju.model.TpBillOrder;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * 定时器
+ * @author weiximei
+ */
+@Component
+@Slf4j
+public class BillQuartz {
+
+    @Autowired
+    private TpBillOrderMapper tpBillOrderMapper;
+
+    @Autowired
+    private TpBillInvoiceMapper tpBillInvoiceMapper;
+
+    @Scheduled(cron = "0 0/10 * * * ?")
+    public void billInvoice() {
+        log.info("定时任务，扫描订单，超过 10 分未付款则，关闭订单！");
+        List<TpBillOrder> billOrderList = tpBillOrderMapper.selectCloseOrder();
+        if (!billOrderList.isEmpty()) {
+            // 把缴费单变为未交费
+            billOrderList.forEach(e->{
+                TpBillInvoice tpBillInvoice = tpBillInvoiceMapper.selectByPrimaryKey(e.getTpBillInvoiceId());
+                tpBillInvoice.setBillStatus("0");
+                tpBillInvoiceMapper.updateByPrimaryKeySelective(tpBillInvoice);
+            });
+
+            // 关闭订单
+            billOrderList.forEach(e -> {
+                e.setOrderStatus("3");
+                tpBillOrderMapper.updateByPrimaryKeySelective(e);
+            });
+
+        }
+    }
+
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpBillInvoiceMapper.java

@@ -3,6 +3,8 @@ package com.community.huiju.dao;
 import com.community.huiju.model.TpBillInvoice;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.ResultMap;
+import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 import java.util.Map;
@@ -51,4 +53,19 @@ public interface TpBillInvoiceMapper {
     List<TpBillInvoice> selectByBuildingOwnerInfoId(@Param("buildingOwnerInfoId") Integer buildingOwnerInfoId);
 
     int updateBeach(Map<String, Object> map);
+
+    /**
+     * 根据 id 查询缴费单
+     * @param billId
+     * @return
+     */
+    @ResultMap("BaseResultMap")
+    @Select("select " +
+            "t.* ," +
+            "b.bill_name as billName " +
+            "from " +
+            "tp_bill_invoice t " +
+            "LEFT JOIN tp_bill b ON t.bill_id = b.id " +
+            "where t.id = #{billId}")
+    TpBillInvoice selectByIdBillInvoiceInfo(Integer billId);
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpBillOrderMapper.java

@@ -43,7 +43,7 @@ public interface TpBillOrderMapper {
      */
     @ResultMap("BaseResultMap")
     @Select("SELECT tbo.* FROM tp_bill_order tbo LEFT JOIN tp_bill_invoice tbi on tbo.tp_bill_invoice_id = tbi.id " +
-            "WHERE tbi.room_no_id = #{roomNoId} GROUP BY tbo.order_bumber")
+            "WHERE tbi.room_no_id = #{roomNoId} and tbo.order_status = 1 GROUP BY tbo.order_bumber")
     List<TpBillOrder> selectByRoomNoId(@Param("roomNoId") Integer roomNoId);
 
     /**
@@ -55,4 +55,21 @@ public interface TpBillOrderMapper {
     @Select("SELECT * FROM tp_bill_order WHERE order_bumber = #{orderBumber} GROUP BY tp_bill_id")
     List<TpBillOrder> selectByOrderNumberBill(@Param("orderBumber") String orderBumber);
 
+    /**
+     * 可关闭的订单
+     * @return
+     */
+    @ResultMap("BaseResultMap")
+    @Select("SELECT t.* from tp_bill_order t where TIMESTAMPDIFF(MINUTE,create_date,now()) >= 10 and t.order_status in (0,2)")
+    List<TpBillOrder> selectCloseOrder();
+
+    /**
+     * 根据收费组id 和 订单号 查询出这个订单号内该收费组所有的数据
+     * @param tpBillId
+     * @param orderNumber
+     * @return
+     */
+    @ResultMap("BaseResultMap")
+    @Select("SELECT * FROM tp_bill_order WHERE order_bumber = #{orderNumber} and tp_bill_id = #{tpBillId}")
+    List<TpBillOrder> selectByBillIdAndOrderNumber(@Param("tpBillId") Integer tpBillId, @Param("orderNumber") String orderNumber);
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/model/TpBillInvoice.java

@@ -42,6 +42,13 @@ public class TpBillInvoice {
      */
     private String payType;
 
+    // =================================
+
+    /**
+     * 转换后金额，用于支付
+     */
+    private Double sumPayPrice;
+
     public Integer getId() {
         return id;
     }
@@ -185,4 +192,12 @@ public class TpBillInvoice {
     public void setPayType(String payType) {
         this.payType = payType;
     }
+
+    public Double getSumPayPrice() {
+        return sumPayPrice;
+    }
+
+    public void setSumPayPrice(Double sumPayPrice) {
+        this.sumPayPrice = sumPayPrice;
+    }
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/model/TpBillOrder.java

@@ -35,12 +35,12 @@ public class TpBillOrder {
     /**
      * 订单总额
      */
-    private Long sumPrice;
+    private Double sumPrice;
 
     /**
-     * 缴费组集合
+     * 缴费单集合
      */
-    private List<TpBill> billList;
+    private List<TpBillInvoice> billList;
 
     public Integer getId() {
         return id;
@@ -130,19 +130,19 @@ public class TpBillOrder {
         this.payPhone = payPhone;
     }
 
-    public Long getSumPrice() {
+    public Double getSumPrice() {
         return sumPrice;
     }
 
-    public void setSumPrice(Long sumPrice) {
+    public void setSumPrice(Double sumPrice) {
         this.sumPrice = sumPrice;
     }
 
-    public List<TpBill> getBillList() {
+    public List<TpBillInvoice> getBillList() {
         return billList;
     }
 
-    public void setBillList(List<TpBill> billList) {
+    public void setBillList(List<TpBillInvoice> billList) {
         this.billList = billList;
     }
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/BillServiceImpl.java

@@ -7,6 +7,7 @@ import com.community.huiju.model.*;
 import com.community.huiju.service.BillServiceI;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
+import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -14,6 +15,7 @@ import org.springframework.stereotype.Service;
 
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 
 /**
@@ -102,12 +104,17 @@ public class BillServiceImpl implements BillServiceI {
 		// 所有订单
 		List<TpBillOrder> billOrderList = tpBillOrderMapper.selectByRoomNoId(userElement.getRoomNoId());
 		billOrderList.forEach(e->{
+			// 这个订单的所有缴费信息
+			List<TpBillOrder> orderList = tpBillOrderMapper.selectByOrderBumber(e.getOrderBumber());
+
 			// 缴费组
-			List<TpBill> billsCollect = billOrderList.stream().map(billOrder -> tpBillMapper.selectByPrimaryKey(billOrder.getTpBillId())).collect(Collectors.toList());
+			List<TpBillInvoice> tpBillInvoices = orderList.stream().map(billOrder -> tpBillInvoiceMapper.selectByIdBillInvoiceInfo(billOrder.getTpBillInvoiceId())).collect(Collectors.toList());
+			tpBillInvoices.forEach( billInvoice -> billInvoice.setSumPayPrice(Double.parseDouble(billInvoice.getPayPrice() + "") / 100));
+
 			// 所有缴费组的总额
-			Long billCountPrice = billsCollect.stream().map(billCount -> Integer.parseInt(billCount.getPayPrice())).count();
+			Double billCountPrice = Double.parseDouble(tpBillInvoices.stream().map(billCount -> billCount.getPayPrice()).count() + "") / 100;
 
-			e.setBillList(billsCollect);
+			e.setBillList(tpBillInvoices);
 			e.setSumPrice(billCountPrice);
 		});
 
@@ -132,10 +139,12 @@ public class BillServiceImpl implements BillServiceI {
 			responseBean.addError("订单号不存在！");
 			return responseBean;
 		}
-		// 每个缴费组数据
-		List<TpBill> tpBillList = billOrderList.stream().map(e -> tpBillMapper.selectByPrimaryKey(e.getTpBillId())).collect(Collectors.toList());
-		// 所有缴费组的总额
-		Long billCountPrice = tpBillList.stream().map(billCount -> Integer.parseInt(billCount.getPayPrice())).count();
+		// 每个缴费单数据
+		List<TpBillInvoice> tpBillInvoices = billOrderList.stream().map(e -> tpBillInvoiceMapper.selectByIdBillInvoiceInfo(e.getTpBillInvoiceId())).collect(Collectors.toList());
+		tpBillInvoices.forEach(e -> e.setSumPayPrice(Double.parseDouble(e.getPayPrice() + "") / 100));
+
+		// 这个订单总额
+		Double billCountPrice = Double.parseDouble(tpBillInvoices.stream().map(e -> e.getPayPrice()).count() + "") / 100;
 
 		// 因为订单号是多条，取第一条即可
 		TpBillOrder tpBillOrder = billOrderList.get(0);
@@ -152,7 +161,7 @@ public class BillServiceImpl implements BillServiceI {
 		map.put("updateDate", tpBillOrder.getUpdateDate());
 		map.put("payType", tpBillStatement.getPayType());
 		map.put("payRemark", tpBillStatement.getPayRemark());
-		map.put("list", tpBillList);
+		map.put("list", tpBillInvoices);
 
 		responseBean.addSuccess(map);
 		return responseBean;

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/WxPayServiceImpl.java

@@ -6,6 +6,7 @@ import com.community.huiju.common.wxpay.WXPay;
 import com.community.huiju.common.wxpay.WXPayConstants;
 import com.community.huiju.common.wxpay.WXPayUtil;
 import com.community.huiju.dao.*;
+import com.community.huiju.exception.WisdomException;
 import com.community.huiju.model.*;
 import com.community.huiju.service.WxPayServiceI;
 import com.google.common.collect.Lists;
@@ -76,6 +77,12 @@ public class WxPayServiceImpl implements WxPayServiceI {
 		if (CollectionUtils.isEmpty(billOrderList)){
 			throw new Exception("订单不存在");
 		}
+		// 检测订单是否 已关闭
+		billOrderList.forEach(e-> {
+			if ("3".equals(e.getOrderStatus())) {
+				throw new WisdomException("无法支付已关闭的订单!");
+			}
+		});
 
 		// 计算金额
 		Integer payPrice = billOrderList.stream().mapToInt(e -> tpBillInvoiceMapper.selectByPrimaryKey(e.getTpBillInvoiceId()).getPayPrice()).sum();
@@ -225,8 +232,6 @@ public class WxPayServiceImpl implements WxPayServiceI {
 		// 如果是家属/租客, 应该用业主的用户id
 		TaUser taUser = taUserMapper.selectByPrimaryKey(userElement.getId());
 
-		List<TpBillOrder> billOrderList = Lists.newArrayList();
-
 		Random random = new Random();
 		String orderNo = String.valueOf(System.currentTimeMillis()) + random.nextInt();
 
@@ -249,18 +254,14 @@ public class WxPayServiceImpl implements WxPayServiceI {
 			tpBillOrder.setUpdateUser(userElement.getId());
 			tpBillOrder.setOrderBumber(orderNo);
 			tpBillOrder.setPayPhone(taUser.getLoginName());
+			tpBillOrder.setOrderStatus("0");
 
 			tpBillOrderMapper.insertSelective(tpBillOrder);
 
-			// billOrderList.add(tpBillOrder);
 		}
 
 		// 修改缴费人
-		// updateBillInvoiceBillStatus(billInvoiceIdArray, user.getUserName(), "1");
-
-		// 生成缴费订单
-		// tpBillOrderMapper.batchInsertSelective(billOrderList);
-
+		 updateBillInvoiceBillStatus(billInvoiceIdArray, taUser.getUserName(), "3");
 		return orderNo;
 	}
 	
@@ -274,20 +275,6 @@ public class WxPayServiceImpl implements WxPayServiceI {
 	@Transactional(rollbackFor = Exception.class)
 	public void wxCancelPay(String outTradeNo, UserElement userElement) throws Exception {
 
-//		Integer userId = userElement.getId();
-//
-//		//获取支付金额
-//		TpBillInvoice tpBillInvoice = tpBillInvoiceMapper.selectByIdAndUserId(billInvoiceId,userId,userElement.getCommunityId());
-//		if (null == tpBillInvoice){
-//			throw new Exception("订单不存在");
-//		}else if (!tpBillInvoice.getBillStatus().equals("3")){
-//			throw new Exception("不是正在支付的订单");
-//		}
-//		//更新为正在支付状态
-//		updateBillInvoiceBillStatus(billInvoiceId,"0");
-
-
-
 		//获取支付金额
 		List<TpBillOrder> billOrderList = tpBillOrderMapper.selectByOrderBumber(outTradeNo);
 		if (CollectionUtils.isEmpty(billOrderList)){
@@ -306,14 +293,14 @@ public class WxPayServiceImpl implements WxPayServiceI {
 		// 缴费单id集合
 		List<Integer> billInvoiceIdList = billInvoiceList.stream().map(e -> e.getId()).collect(Collectors.toList());
 
-		//更新为正在支付状态
-		updateBillInvoiceBillStatus(billInvoiceIdList,"0");
+		//更新为 未支付状态
+		updateBillInvoiceBillStatus(billInvoiceIdList, "","0");
 		log.info("订单: {}， 状态变更为取消支付", outTradeNo);
 
-		// 更改订单状态 为支付成功
+		// 更改订单状态 为订单已关闭
 		List<TpBillOrder> billOrders = tpBillOrderMapper.selectByOrderBumber(outTradeNo);
 		billOrders.forEach(e-> {
-			e.setOrderStatus("0");
+			e.setOrderStatus("3");
 			tpBillOrderMapper.updateByPrimaryKeySelective(e);
 		});
 	}

CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/BillStatementController.java

@@ -37,7 +37,7 @@ public class BillStatementController extends BaseController {
 
     @ApiOperation(value = "获取订单信息", notes = "获取订单信息")
     @ApiImplicitParams({
-            @ApiImplicitParam(dataTypeClass = String.class, paramType = "body", name = "parameter", value = "id流水编号," +
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "body", name = "parameter", value = "payPhone订单号," +
                     "billId缴费项编号,billName缴费项名称,billInvoiceId缴费单编号,payName缴费人"),
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "header", name = "X-Auth-Token", value = "token")
     })

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/BillOrderServiceImpl.java

@@ -50,6 +50,7 @@ public class BillOrderServiceImpl extends ServiceImpl<TpBillOrderMapper, TpBillO
         billOrderList.forEach(e->{
             QueryWrapper<TpBillOrder> billInvoiceOrderQueryWrapper = new QueryWrapper<>();
             billInvoiceOrderQueryWrapper.eq("tp_bill_id", e.getTpBillId());
+            billInvoiceOrderQueryWrapper.eq("order_bumber", orderNumber);
             // 当前收费组下的所有的缴费单
             List<TpBillOrder> billInvoiceOrderList = tpBillOrderMapper.selectList(billInvoiceOrderQueryWrapper);
             List<BillInvoice> billInvoiceList = billInvoiceOrderList.stream().map(billInvoice -> {

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/BillStatementServiceImpl.java

@@ -51,8 +51,8 @@ public class BillStatementServiceImpl extends ServiceImpl<BillStatementMapper, B
 
         Integer pageNum = jsonObject.getInteger("pageNum");
         Integer pageSize = jsonObject.getInteger("pageSize");
-        // 流水 id
-        Integer id = jsonObject.getInteger("id");
+        // 订单号 orderBumber
+        String orderBumber = jsonObject.getString("orderBumber");
         // 缴费项 id
         Integer billId = jsonObject.getInteger("billId");
         // 缴费项 名称
@@ -64,7 +64,7 @@ public class BillStatementServiceImpl extends ServiceImpl<BillStatementMapper, B
 
         // 参数
         Map<String, Object> map = Maps.newHashMap();
-        map.put("id", id);
+        map.put("orderBumber", orderBumber);
         map.put("billId", billId);
         map.put("billName", billName);
         map.put("billInvoiceId", billInvoiceId);

CODE/smart-community/property-api/src/main/resources/mapper/BillOrderMapper.xml

@@ -12,8 +12,8 @@
         LEFT JOIN tp_bill tb on tbo.tp_bill_id = tb.id
         <where>
             <trim prefixOverrides="and | or">
-                <if test="map.id != null">
-                    and tbo.id like CONCAT('%',#{map.id},'%')
+                <if test="map.orderBumber != null">
+                    and tbo.order_bumber like CONCAT('%',#{map.orderBumber},'%')
                 </if>
                 <if test="map.billId != null">
                     and tbo.tp_bill_id like CONCAT('%',#{map.billId},'%')

VUECODE/smart-property-manage/src/api/billStatement.js

@@ -6,11 +6,11 @@ export function getBillStatementAll(data) {
     url: '/bill/statement/all',
     method: 'post',
     data: {
-      id: data.id, // 流水 id
+      orderBumber: data.orderBumber, // 订单号
       billId: data.billId, // 缴费项 id
       billName: data.billName, //  缴费项 名称
       billInvoiceId: data.billInvoiceId, // 缴费单 编号
-      payPhone: data.payName, //  缴费人手机号
+      payPhone: data.payPhone, //  缴费人手机号
       pageNum: data.pageNum,
       pageSize: data.pageSize
     }

VUECODE/smart-property-manage/src/views/bill/statement/index.vue

@@ -2,7 +2,7 @@
   <div id="root">
     <el-form :model="formInline" inline class="form-inline">
       <el-form-item label="订单号">
-        <el-input v-model="formInline.id" placeholder="订单号"/>
+        <el-input v-model="formInline.orderBumber" placeholder="订单号"/>
       </el-form-item>
       <el-form-item label="缴费项目编号">
         <el-input v-model="formInline.billId" placeholder="缴费项目编号"/>
@@ -72,7 +72,9 @@
       <el-table-column
         prop="orderStatus"
         align="center"
-        label="订单状态"/>
+        label="订单状态">
+        <template slot-scope="scope">{{ show(scope.row.orderStatus) }}</template>
+      </el-table-column>
       <el-table-column
         prop="payPhone"
         align="center"
@@ -119,7 +121,7 @@ export default {
   data() {
     return {
       formInline: {
-        id: '', // 流水 id
+        orderBumber: '', // 流水 id
         billId: '', // 缴费项 id
         billName: '', //  缴费项 名称
         billInvoiceId: '', // 缴费单 编号
@@ -239,6 +241,25 @@ export default {
     },
     getOrderInfo(id) { // 跳转订单详情
       this.$router.push({ name: 'bill-statement-info-index', query: { id: id }})
+    },
+    show(orderStatus) {
+      let str = ''
+      switch (orderStatus) {
+        case '0':
+          str = '未支付'
+          break
+        case '1':
+          str = '已支付'
+          break
+        case '2':
+          str = '正在支付'
+          break
+        case '3':
+          str = '已关闭'
+          break
+      }
+
+      return str
     }
   }
 }