[账单][修改][导入数据]

mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java

@@ -1142,27 +1142,27 @@ public class WxBillAllServiceImpl implements WxBillAllService {
                 wxMerchantShop.setIsDel(EnumDelStatus.NOT_DEL.getCode());
                 List<WxMerchantShop> select = wxMerchantShopMapper.select(wxMerchantShop);
                 if (!select.isEmpty()) {
-                    otherDepositQuery = new WxBillOtherDeposit();
+                    otherDeposit = new WxBillOtherDeposit();
                     final IdWorker idWorker = IdWorker.get();
-                    otherDepositQuery.setId(idWorker.nextId());
-                    otherDepositQuery.setName(bill.getBillAttr());
-                    otherDepositQuery.setComments(bill.getBillAttr());
-                    otherDepositQuery.setStatus(EnumBillRentStatus.PAID.getCode());
-                    otherDepositQuery.setReceivePay(pay);
-                    otherDepositQuery.setReceiveDate(bill.getReceiveDate());
-                    otherDepositQuery.setPay(pay);
-                    otherDepositQuery.setTenantId(tenantId);
-                    otherDepositQuery.setMerchantId(bill.getMerchantId());
-                    otherDepositQuery.setShopId(select.get(0).getShopId());
-                    otherDepositQuery.setRentShopType(bill.getMerchantType());
-                    otherDepositQuery.setPayDate(bill.getPayDate());
+                    otherDeposit.setId(idWorker.nextId());
+                    otherDeposit.setName(bill.getBillAttr());
+                    otherDeposit.setComments(bill.getBillAttr());
+                    otherDeposit.setStatus(EnumBillRentStatus.PAID.getCode());
+                    otherDeposit.setReceivePay(pay);
+                    otherDeposit.setReceiveDate(bill.getReceiveDate());
+                    otherDeposit.setPay(pay);
+                    otherDeposit.setTenantId(tenantId);
+                    otherDeposit.setMerchantId(bill.getMerchantId());
+                    otherDeposit.setShopId(select.get(0).getShopId());
+                    otherDeposit.setRentShopType(bill.getMerchantType());
+                    otherDeposit.setPayDate(bill.getPayDate());
                     Date date = new Date();
-                    otherDepositQuery.setCreatetime(date);
-                    otherDepositQuery.setUpdatetime(date);
-                    otherDepositQuery.setExpiredDay(0L);
-                    otherDepositQuery.setOwe(0L);
-                    otherDepositQuery.setIsDel(EnumDelStatus.NOT_DEL.getCode());
-                    wxBillOtherDepositMapper.insertSelective(otherDepositQuery);
+                    otherDeposit.setCreatetime(date);
+                    otherDeposit.setUpdatetime(date);
+                    otherDeposit.setExpiredDay(0L);
+                    otherDeposit.setOwe(0L);
+                    otherDeposit.setIsDel(EnumDelStatus.NOT_DEL.getCode());
+                    wxBillOtherDepositMapper.insertSelective(otherDeposit);
                 }
             }
             addActionImport(otherDeposit.getId(), bill.getPayWay(), user);