winter 1 год назад
Родитель
Сommit
3c4ba4a6c8
6 измененных файлов: 53 добавлений и 3 удалений
  1. +2
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxFinanceReceive.java
  2. +9
    -1
      mallinkService/src/main/java/com/iformall/print/data/impl/PrintFinanceReceiveDataHandler.java
  3. +2
    -0
      mallinkService/src/main/java/com/iformall/service/WxMerchantService.java
  4. +5
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java
  5. +34
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java
  6. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java

+ 2
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxFinanceReceive.java Просмотреть файл

@@ -175,6 +175,8 @@ public class WxFinanceReceive extends TenantEntity {
@TableField(exist = false)
private List<WxBillPayWay> payWays;
@TableField(exist = false)
private String usePerson;
@TableField(exist = false)
private String shopNumber;
@TableField(exist = false)


+ 9
- 1
mallinkService/src/main/java/com/iformall/print/data/impl/PrintFinanceReceiveDataHandler.java Просмотреть файл

@@ -13,6 +13,7 @@ import com.iformall.domain.po.WxAllBill;
import com.iformall.domain.po.WxEnergyFees;
import com.iformall.domain.po.WxFinanceReceive;
import com.iformall.domain.po.WxMerchant;
import com.iformall.enums.EnumYesOrNo;
import com.iformall.print.data.PrintDataParser;
import com.iformall.utils.DateUtils;
import com.iformall.utils.PriceUtilV2;
@@ -69,10 +70,17 @@ public class PrintFinanceReceiveDataHandler implements PrintDataParser{
if (null != merchantMap) {
WxMerchant m = merchantMap.get(receive.getMerchantId());
if (null != m) {
return m.getName();
//如果商户是私密的,则不返回
if (m.getIsPrivate() == EnumYesOrNo.YES.getCode()) {
return "";
}else {
return m.getName();
}
}
}
return "";
}else if (name.equals("usePerson")) {
return receive.getUsePerson();
}else if (name.equals("shopNumber")) {
return receive.getShopNumber();
}


+ 2
- 0
mallinkService/src/main/java/com/iformall/service/WxMerchantService.java Просмотреть файл

@@ -230,4 +230,6 @@ public interface WxMerchantService {
Map<Long,WxMerchant> getShopMerchantMap(WxShop wxShop);
List<Long> getShopMerchantIds(WxShop wxShop);
String getPrivateMerchantUser(Long merchantId);
}

+ 5
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java Просмотреть файл

@@ -257,6 +257,7 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService {
JSONArray items = o.getJSONArray("tempItems");
EnumFinancePrintDataType printDatatype = EnumFinancePrintDataType.getEnum(template.getType());
WxMerchant mq = new WxMerchant();
mq.setIsDel(EnumYesOrNo.NO.getCode());
mq.setTenantId(tenantId);
Map<Long,WxMerchant> merchantMap = wxMerchantService.findMerchantMap(mq);
WxEnergyFees feq = new WxEnergyFees();
@@ -283,6 +284,10 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService {
}else {
re.setShopNumber("");
}
//私密的查询业主和租户
if (null != re.getMerchantId()) {
re.setUsePerson(wxMerchantService.getPrivateMerchantUser(re.getMerchantId()));
}
List<WxFinanceReceiveBill> rbills = wxFinanceService.getReceiveBills(rb);
PrintVo vo = handleComponentData(re.getId(),templateId,o,items, printFinanceReceiveDataHandler,re,printReceiveBillDataHandler, rbills,merchantMap,feesMap,shopNumber);
if (null != vo) {


+ 34
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java Просмотреть файл

@@ -59,6 +59,9 @@ public class WxMerchantServiceImpl implements WxMerchantService {

@Autowired
WxShopMapper wxShopMapper;
@Autowired
WxShopUsersMapper wxShopUsersMapper;

@Autowired
WxMerchantShopMapper wxMerchantShopMapper;
@@ -2114,7 +2117,10 @@ public class WxMerchantServiceImpl implements WxMerchantService {
Map<Long,WxMerchant> merchantMap = new HashMap<>();
List<WxMerchant> list = this.findList(merchantQ);
if(!list.isEmpty()){
merchantMap = list.stream().collect(Collectors.toMap(WxMerchant::getId, Function.identity()));
for (int i = 0 ; i < list.size(); i++ ){
WxMerchant m = list.get(i);
merchantMap.put(m.getId(), m);
}
}
return merchantMap;
}
@@ -2390,4 +2396,31 @@ public class WxMerchantServiceImpl implements WxMerchantService {
merchantShopQ.setIsDel(0);
return wxMerchantShopMapper.findMerchantIdList(merchantShopQ);
}

@Override
public String getPrivateMerchantUser(Long merchantId) {
WxMerchant m = this.selectById(merchantId);
if (null == m || m.getIsPrivate() != EnumYesOrNo.YES.getCode()){
return null;
}
WxMerchantShop merchantShopQ = new WxMerchantShop();
merchantShopQ.updateTenantInfo(m);
merchantShopQ.setMerchantId(merchantId);
merchantShopQ.setIsDel(0);
List<WxMerchantShop> merchantShopList = wxMerchantShopMapper.findList(merchantShopQ);
if (null == merchantShopList || merchantShopList.size() <= 0 ) {
return null;
}
WxMerchantShop ms = merchantShopList.get(0);
WxShopUsers suq = new WxShopUsers();
suq.updateTenantInfo(m);
suq.setShopId(ms.getShopId());
suq.setStatus(EnumShopUsersStatus.LIVE.getCode());
suq.setSortColumn(" type desc");
List<WxShopUsers> userList = wxShopUsersMapper.findList(suq);
if (null == userList || userList.size() <= 0 ){
return null;
}
return userList.get(0).getName();
}
}

+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java Просмотреть файл

@@ -370,7 +370,7 @@ public class WxShopServiceImpl implements WxShopService {
if (record.getType() == EnumRentShopType.XIZILOU.getCode()) {
WxMerchant merchant = new WxMerchant();
merchant.updateTenantInfo(record);
merchant.setName("[系统]"+record.getShopNumber());
merchant.setName("[系统房号]"+record.getShopNumber());
int count = wxMerchantMapper.hasMerchant(merchant);
if (count <= 0 ) {
merchant.setId(idWorker.nextId());


Загрузка…
Отмена
Сохранить