Merge remote-tracking branch 'origin/master'

zhsw-common/src/main/java/com/rongwei/zhsw/system/service/impl/PrintServiceImpl.java

@@ -13,6 +13,7 @@ import com.rongwei.rwadmincommon.system.vo.SysUserVo;
 import com.rongwei.rwcommon.base.BaseDo;
 import com.rongwei.rwcommon.base.R;
 import com.rongwei.rwcommon.base.exception.CustomException;
+import com.rongwei.rwcommon.utils.StringUtils;
 import com.rongwei.zhsw.system.dao.SwPrintRepairConfigDao;
 import com.rongwei.zhsw.system.service.PrintService;
 import com.rongwei.zhsw.system.utils.NumberToChineseUppercaseUtils;
@@ -105,10 +106,11 @@ public class PrintServiceImpl implements PrintService {
                 log.error("户号：{}不存在", swBillingRecordDo.getUsernumber());
                 throw new CustomException("以下户号： " + swBillingRecordDo.getUsernumber() + "不存在");
             }
+
             listData.add(dateStr);
             listData.add(swUserManagementDo.getUsernumber());
             listData.add(swUserManagementDo.getAccountbalance().stripTrailingZeros());
-            String usertype = swUserManagementDo.getUsertype();
+            String usertype = swUserManagementDo.getUsertypeid();
             SysDictDo sysDictDo = sysDictDoList.stream().filter(dict -> dict.getValue().equals(usertype)).findFirst().orElse(null);
             listData.add(sysDictDo == null ? "" : sysDictDo.getName());
             listData.add(swUserManagementDo.getUsername());
@@ -133,7 +135,7 @@ public class PrintServiceImpl implements PrintService {
             }
             listData.add(NumberToChineseUppercaseUtils.convert(swBillingRecordDo.getPaidin()));
             listData.add(swBillingRecordDo.getPaidin());
-            listData.add(currentUser.getCreateusername());
+            listData.add(swBillingRecordDo.getTollcollectorname());
             datas.add(listData);
         }
         /********数据组装结束************/

zhsw-common/src/main/java/com/rongwei/zhsw/system/wechat/impl/PaymentRecordServiceImpl.java

@@ -191,7 +191,7 @@ public class PaymentRecordServiceImpl implements PaymentRecordService {
         swBillingRecordDo.setWatertype(swUserManagementDo.getWatertype());
         swBillingRecordDo.setAddress(swUserManagementDo.getAddress());
         swBillingRecordDo.setTollcollectorid("");
-        swBillingRecordDo.setTollcollectorname("");
+        swBillingRecordDo.setTollcollectorname("微信缴费");
         swBillingRecordDo.setOriginalbalance(swUserManagementDo.getAccountbalance());
         swBillingRecordDo.setUsertype(swUserManagementDo.getUsertypeid());
         /******************实缴******************/