修复 app 端, 支付完成后 的流水, 缴费人等问题

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

@@ -5,8 +5,12 @@ import com.community.huiju.common.wxpay.HfWxConfig;
 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.TaUserMapper;
 import com.community.huiju.dao.TpBillInvoiceMapper;
+import com.community.huiju.dao.TpBillMapper;
 import com.community.huiju.dao.TpBillStatementMapper;
+import com.community.huiju.model.TaUser;
+import com.community.huiju.model.TpBill;
 import com.community.huiju.model.TpBillInvoice;
 import com.community.huiju.model.TpBillStatement;
 import com.community.huiju.service.WxPayServiceI;
@@ -35,7 +39,14 @@ public class WxPayServiceImpl implements WxPayServiceI {
 	
 	@Autowired
 	private TpBillStatementMapper tpBillStatementMapper;
-	
+
+	@Autowired
+	private TpBillMapper tpBillMapper;
+
+	@Autowired
+	private TaUserMapper taUserMapper;
+
+
 	/**
 	 * 微信支付统一下单
 	 *
@@ -44,6 +55,7 @@ public class WxPayServiceImpl implements WxPayServiceI {
 	 * @param userElement
 	 */
 	@Override
+	@Transactional(rollbackFor = Exception.class)
 	public Map<String, String> wxUnifiedOrder(Integer billInvoiceId, UserElement userElement) throws Exception {
 		HfWxConfig config = new HfWxConfig();
 		WXPay wxpay = new WXPay(config);
@@ -98,6 +110,7 @@ public class WxPayServiceImpl implements WxPayServiceI {
 	 * @param resultMap
 	 */
 	@Override
+	@Transactional(rollbackFor = Exception.class)
 	public String wxNotify(Map<String, String> resultMap) throws Exception {
 		String outTradeNo = resultMap.get("out_trade_no");
 		TpBillInvoice tpBillInvoice = tpBillInvoiceMapper.selectByOutTradeNo(outTradeNo);
@@ -106,8 +119,19 @@ public class WxPayServiceImpl implements WxPayServiceI {
 		}else if (!tpBillInvoice.getBillStatus().equals("3")){
 			return "订单状态出错";
 		}
-		//更新为正在支付状态
-		updateBillInvoiceBillStatus(tpBillInvoice.getId(),"1");
+
+		// 根据 app 用户id, 查询用户
+		TaUser taUser = taUserMapper.selectByPrimaryKey(tpBillInvoice.getTaUserId());
+
+		// 更新为正在支付状态
+		// 更改收费单的缴费人, 缴费时间, 修改人, 修改时间
+		tpBillInvoice.setBillStatus("1");
+		tpBillInvoice.setPayName(taUser.getUserName());
+		tpBillInvoice.setPayDate(new Date());
+		tpBillInvoice.setUpdateDate(new Date());
+		tpBillInvoice.setUpdateUser(taUser.getId());
+		tpBillInvoiceMapper.updateByPrimaryKeySelective(tpBillInvoice);
+
 		//插入流水账单表
 		TpBillStatement tpBillStatement = new TpBillStatement();
 		tpBillStatement.setBillInvoiceId(tpBillInvoice.getId());
@@ -119,6 +143,21 @@ public class WxPayServiceImpl implements WxPayServiceI {
 		tpBillStatement.setPayType("0");
 		tpBillStatement.setCreateTime(new Date());
 		tpBillStatementMapper.insert(tpBillStatement);
+
+		// 更新 收费单流水id
+		tpBillInvoice.setBillStatementId(tpBillStatement.getId());
+		tpBillInvoiceMapper.updateByPrimaryKeySelective(tpBillInvoice);
+
+		// 更新收费组的 未交费用户数 和 已缴费用户数
+		TpBill tpBill = tpBillMapper.selectById(tpBillInvoice.getBillId());
+		tpBill.setPayedNum(tpBill.getPayedNum() + 1);
+		tpBill.setUnpayedNum(tpBill.getUnpayedNum() - 1);
+		// 如果为零, 表示这个收费组收费完成
+		if (tpBill.getUnpayedNum() == 0) {
+			tpBill.setBillStatus("1");
+		}
+		tpBillMapper.updateByPrimaryKeySelective(tpBill);
+
 		return "success";
 	}
 	
@@ -138,6 +177,7 @@ public class WxPayServiceImpl implements WxPayServiceI {
 	}
 	
 	@Override
+	@Transactional(rollbackFor = Exception.class)
 	public void wxStartPay(Integer billInvoiceId, UserElement userElement) throws Exception {
 		//获取支付金额
 		TpBillInvoice tpBillInvoice = tpBillInvoiceMapper.selectByIdAndUserId(billInvoiceId,userElement.getId(),userElement.getCommunityId());
@@ -157,6 +197,7 @@ public class WxPayServiceImpl implements WxPayServiceI {
 	 * @param userElement
 	 */
 	@Override
+	@Transactional(rollbackFor = Exception.class)
 	public void wxCancelPay(Integer billInvoiceId, UserElement userElement) throws Exception {
 		//获取支付金额
 		TpBillInvoice tpBillInvoice = tpBillInvoiceMapper.selectByIdAndUserId(billInvoiceId,userElement.getId(),userElement.getCommunityId());

CODE/smart-community/app-api/src/main/resources/mapper/TpBillStatementMapper.xml

@@ -26,7 +26,7 @@
     delete from tp_bill_statement
     where id = #{id,jdbcType=INTEGER}
   </delete>
-  <insert id="insert" parameterType="com.community.huiju.model.TpBillStatement" >
+  <insert id="insert" parameterType="com.community.huiju.model.TpBillStatement" useGeneratedKeys="true" keyColumn="id" keyProperty="id" >
     insert into tp_bill_statement (id, community_id, bill_invoice_id, 
       ta_user_id, pay_price, pay_name, 
       pay_remark, pay_type, create_time