完成 缴费单模板下载, app端匹配缴费单, 楼栋资料库匹配缴费单

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

@@ -47,4 +47,8 @@ public interface TpBillInvoiceMapper {
 	TpBillInvoice selectByIdAndUserId(@Param("id") Integer billInvoiceId,@Param("userId") Integer userId,@Param("communityId") Integer communityId);
     
     TpBillInvoice selectByOutTradeNo(@Param("outTradeNo") String outTradeNo);
+
+    List<TpBillInvoice> selectByBuildingOwnerInfoId(@Param("buildingOwnerInfoId") Integer buildingOwnerInfoId);
+
+    int updateBeach(Map<String, Object> map);
 }

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

@@ -68,6 +68,9 @@ public class TaUserServiceImpl implements ITaUserService {
     @Autowired
     private TaFaceMapper taFaceMapper;
 
+    @Autowired
+    private TpBillInvoiceMapper tpBillInvoiceMapper;
+
     @Transactional(rollbackFor = Exception.class)
     @Override
     @Deprecated
@@ -211,6 +214,15 @@ public class TaUserServiceImpl implements ITaUserService {
             buildingOwnerInfo.setUpdateDate(new Date());
             tpBuildingOwnerInfoMapper.updateByPrimaryKeySelective(buildingOwnerInfo);
 
+            // 开始绑定缴费单
+            List<TpBillInvoice> tpBillInvoices = tpBillInvoiceMapper.selectByBuildingOwnerInfoId(buildingOwnerInfo.getId());
+            if (CollectionUtils.isNotEmpty(tpBillInvoices)) {
+                Map<String, Object> map = new HashMap<>();
+                map.put("taUserId", user.getId());
+                map.put("list", tpBillInvoices);
+                tpBillInvoiceMapper.updateBeach(map);
+            }
+
         }
 
         // 更新

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

@@ -307,4 +307,21 @@
 	where t.out_trade_no = #{outTradeNo,jdbcType=VARCHAR}
 	and t.status = 1
   </select>
+
+    <select id="selectByBuildingOwnerInfoId" parameterType="integer" resultMap="BaseResultMap" >
+        select
+        <include refid="Base_Column_List"/>
+        from tp_bill_invoice
+        where bill_statement_id = #{buildingOwnerInfoId,jdbcType=INTEGER}
+    </select>
+
+    <update id="updateBeach" parameterType="map" >
+        update tp_bill_invoice
+        set ta_user_id = #{map.taUserId}
+        where id in
+      <foreach collection="map.list" item="item" index="index" separator="," open="(" close=")">
+          #{item.id}
+      </foreach>
+    </update>
+
 </mapper>

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

@@ -226,12 +226,12 @@ public class BillInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper, BillI
         Double payPrice = jsonObject.getDouble("payPrice");
 
         // 判断是不是已经 收费完成
-        Bill bill = billMapper.selectById(billId);
-        if ("1".equals(bill.getBillStatus())) {
-            // 状态 收费完成, 不允许添加收费单
-            responseBean.addError("不能给收费已完成的收费组添加收费单!");
-            return responseBean;
-        }
+//        Bill bill = billMapper.selectById(billId);
+//        if ("1".equals(bill.getBillStatus())) {
+//            // 状态 收费完成, 不允许添加收费单
+//            responseBean.addError("不能给收费已完成的收费组添加收费单!");
+//            return responseBean;
+//        }
 
         // 楼栋资料库
         QueryWrapper<TpBuildingOwnerInfo> queryWrapper = new QueryWrapper<>();

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

@@ -275,7 +275,11 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
                     throw new WisdomException("请输入正确的用户信息! ");
                 }
 
-                // TODO 如果用户不在 app 里面,没有关联, 怎么处理?
+                /**
+                 * 如果用户不在 app 里面,没有关联, 那么就设置 taUserId
+                 * 等业主第一次登陆的时候, 再去自动匹配上去
+                 */
+
                 // 查询app用户id
                 QueryWrapper<TaUser> userQueryWrapper = new QueryWrapper<>();
                 userQueryWrapper.eq("community_id", userElement.getCommunityId());
@@ -283,7 +287,9 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
                 TaUser taUser = taUserMapper.selectOne(userQueryWrapper);
 
                 billInvoice.setBuildingOwnerInfoId(buildingOwnerInfo.getId());
-                billInvoice.setTaUserId(taUser.getId());
+                if (null != taUser) {
+                    billInvoice.setTaUserId(taUser.getId());
+                }
                 billInvoice.setBillInvoiceExplain(bill.getBillExplain());
                 billInvoice.setPayPrice(e.getMoney());
                 billInvoice.setBillStatus("0");

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

@@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.enums.SqlMethod;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -15,21 +14,16 @@ import com.community.commom.session.UserElement;
 import com.community.commom.utils.AccountValidatorUtil;
 import com.community.commom.utils.BeanTools;
 
-import com.community.huiju.dao.TaSysUserRoleMapper;
-import com.community.huiju.dao.TaUserMapper;
-import com.community.huiju.dao.UserMapper;
+import com.community.huiju.dao.*;
 import com.community.huiju.exception.WisdomException;
-import com.community.huiju.model.TaSysUserRole;
-import com.community.huiju.model.TaUser;
+import com.community.huiju.model.*;
 
-import com.community.huiju.dao.TpBuildingOwnerInfoMapper;
-import com.community.huiju.model.TpBuildingOwnerInfo;
-
-import com.community.huiju.model.User;
+import com.community.huiju.service.IBillInvoiceService;
 import com.community.huiju.service.IBuildingOwnerInfoService;
 import com.community.huiju.service.ITaUserService;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.ibatis.binding.MapperMethod;
 import org.apache.ibatis.session.SqlSession;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
@@ -78,6 +72,12 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
 
     @Autowired
     private ITaUserService iTaUserService;
+
+    @Autowired
+    private BillInvoiceMapper billInvoiceMapper;
+
+    @Autowired
+    private IBillInvoiceService iBillInvoiceService;
     
     public static final Logger logger = LoggerFactory.getLogger(BuildingOwnerInfoServiceImpl.class);
     
@@ -232,6 +232,9 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
 
             // 更新APP端用户的角色身份为 业主
             updateAppRole(tpBuildingOwnerInfo.getCommunityId(), appOwnerUser.getId(), Constant.OWNER_ID);
+
+            // 绑定 缴费单
+            bingBillInvoice(user.getId(), tpBuildingOwnerInfo.getId());
         }
 
 
@@ -321,6 +324,10 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
 
             // 更新APP端用户的角色身份为 业主
             updateAppRole(tpBuildingOwnerInfo.getCommunityId(), appOwnerUser.getId(), Constant.OWNER_ID);
+
+            // 绑定 缴费单
+            bingBillInvoice(user.getId(), tpBuildingOwnerInfo.getId());
+
         }
 
 
@@ -349,6 +356,21 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         taSysUserRoleMapper.insert(taSysUserRole);
     }
 
+    /**
+     * 绑定 缴费单
+     * @param taUserId
+     */
+    private void bingBillInvoice(Integer taUserId, Integer buildingOwnerInfoId) {
+        // 开始绑定缴费单
+        QueryWrapper<BillInvoice> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("building_owner_info_id", buildingOwnerInfoId);
+        List<BillInvoice> tpBillInvoices = billInvoiceMapper.selectList(queryWrapper);
+        if (CollectionUtils.isNotEmpty(tpBillInvoices)) {
+            tpBillInvoices.forEach(e -> e.setTaUserId(taUserId));
+            iBillInvoiceService.updateBatchById(tpBillInvoices);
+        }
+    }
+
     @Override
     public ResponseBean getBuildingOrUnitOrNumber(String parameter,Integer communityId) {
 

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

@@ -434,19 +434,21 @@ export default {
     },
     addBillInvoice() {
       // 如果是 收费已完成 的收费项, 则不允许跳进添加页面
-      this.$store.dispatch('GetBillByIdInfo', this.formInline.billId).then(res => {
-        const resCode = res.code
-        if (resCode === '0') {
-          const billStatus = res.data.billStatus
-          if (billStatus === '1') {
-            this.$message.error('不能给收费已完成的收费组添加收费单!')
-            return
-          }
-          this.$router.push({ name: 'bill-info-add', params: { id: this.formInline.billId }})
-        }
-      }).catch(() => {
-        console.log('GetBillByIdInfo error')
-      })
+      // this.$store.dispatch('GetBillByIdInfo', this.formInline.billId).then(res => {
+      //   const resCode = res.code
+      //   if (resCode === '0') {
+      //     const billStatus = res.data.billStatus
+      //     if (billStatus === '1') {
+      //       this.$message.error('不能给收费已完成的收费组添加收费单!')
+      //       return
+      //     }
+      //     this.$router.push({ name: 'bill-info-add', params: { id: this.formInline.billId }})
+      //   }
+      // }).catch(() => {
+      //   console.log('GetBillByIdInfo error')
+      // })
+
+      this.$router.push({ name: 'bill-info-add', params: { id: this.formInline.billId }})
     },
     showPayPrice(payPrice) { //  转换金额
       const price = payPrice / 100