Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents into dev

src/main/java/com/huiju/estateagents/controller/TaRaiseRecordController.java

@@ -506,7 +506,7 @@ public class TaRaiseRecordController extends BaseController {
                     consultantInfo.setConsultantPersonId(consultantPerson.getPersonId());
                 }
             }
-           
+
             taRaiseRecord.setConsultantInfo(consultantInfo);
             //房源与认筹单关系图
             List<TaRaiseHouse> taRaiseHouseList = taRaiseHouseService.list(new QueryWrapper<TaRaiseHouse>().eq("raise_record_id", taRaiseRecord.getRaiseRecordId()));

src/main/java/com/huiju/estateagents/service/impl/WxPayServiceImpl.java

@@ -286,6 +286,7 @@ public class WxPayServiceImpl implements IWxPayService {
             taOrder.setPersonId(refundOrder.getPersonId());
             taOrder.setTradeNo(refundOrder.getTradeNo());
             taOrder.setTotalFee(refundOrder.getTotalFee());
+            taOrder.setTransactionId(refundOrder.getTransactionId());
             return String.valueOf(refundOrder.getTotalFee());
         }
         return null;