Просмотр исходного кода

Merge branch 'aliyun_real_xhxu' of https://git.youlane.cn/server/formallProject into aliyun_real_xhxu

release_toaliyun_real
xhxu 5 лет назад
Родитель
Сommit
4d76b858ca
3 измененных файлов: 12 добавлений и 7 удалений
  1. +4
    -4
      mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java
  2. +6
    -1
      mallinkService/src/main/java/com/iformall/service/impl/MallPermissionServiceImpl.java
  3. +2
    -2
      mallinkService/src/main/resources/mapper/WxRentContractMapper.xml

+ 4
- 4
mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java Просмотреть файл

@@ -164,10 +164,10 @@ public class WxInfoController extends BaseController {
WxBuser oldUser = null;
if (boolHaveUnionId) {
// 优先根据unionId查询
WxBuser userQ = new WxBuser();
userQ.updateTenantInfo(wxAuthorizerInfo);
userQ.setUnionId(unionId);
oldUser = wxBuserService.getByObject(userQ);
// WxBuser userQ = new WxBuser();
// userQ.updateTenantInfo(wxAuthorizerInfo);
// userQ.setUnionId(unionId);
// oldUser = wxBuserService.getByObject(userQ);
}
if (oldUser == null) {
oldUser = wxBuserService.getByOpenId(newUser);


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

@@ -140,7 +140,12 @@ public class MallPermissionServiceImpl implements MallPermissionService {
}};
String menus = wxMallMapper.queryMenusByTenantInfo(q);
JSONArray menuIdList = JSON.parseArray(menus);
return getAllMenuListByParentId(0L, menuIdList.toJavaList(Long.class), boolNav);
if (null != menuIdList) {
return getAllMenuListByParentId(0L, menuIdList.toJavaList(Long.class), boolNav);
}else {
return null;
}
} else {
//用户菜单列表
List<Long> menuIdList = mallUserInfoMapper.queryAllMenuId(userInfo.getId());


+ 2
- 2
mallinkService/src/main/resources/mapper/WxRentContractMapper.xml Просмотреть файл

@@ -521,11 +521,11 @@
</select>

<select id="searchMerchantByname" resultType="hashmap" parameterType="com.iformall.domain.po.WxRentContract">
select merchant_id,merchant_name from wx_rent_contract where tenant_id = #{tenantId} and merchant_name like concat('%',#{merchantName},'%')
select merchant_id,merchant_name from wx_rent_contract where tenant_id = #{tenantId} and merchant_name like concat('%',#{merchantName},'%') and rent_shop_type = 1
</select>

<select id="getByMerchantId" resultType="com.iformall.domain.po.WxRentContract" parameterType="com.iformall.domain.po.WxRentContract">
select * from wx_rent_contract where merchant_id = #{merchantId} and in (3,5) ORDER BY rental_end_date DESC limit 1
select * from wx_rent_contract where merchant_id = #{merchantId} and status in (3,5) ORDER BY rental_end_date DESC limit 1
</select>

<select id="getAllContractBymerchantId" resultType="com.iformall.domain.po.WxRentContract" parameterType="com.iformall.domain.po.WxRentContract">


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