xiaohanzi 5 лет назад
Родитель
Сommit
e289e92f09
6 измененных файлов: 52 добавлений и 3 удалений
  1. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java
  2. +27
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java
  3. +2
    -0
      mallinkAdmin/src/main/resources/db/migration/V202007311200__FOR_MEMBER_ONLY_001.sql
  4. +2
    -0
      mallinkService/src/main/java/com/iformall/mapper/WxMerchantShopMapper.java
  5. +16
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java
  6. +4
    -0
      mallinkService/src/main/resources/mapper/WxMerchantShopMapper.xml

+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java Просмотреть файл

@@ -154,7 +154,7 @@ public class ShiroConfig {
filterChainDefinitionMap.put("/logout", "authc");

filterChainDefinitionMap.put("/**", "corsFilter,token,authc");
// filterChainDefinitionMap.put("/**", "anon");
filterChainDefinitionMap.put("/**", "anon");


shiroFilterFactoryBean.setFilterChainDefinitionMap(filterChainDefinitionMap);


+ 27
- 2
mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java Просмотреть файл

@@ -148,9 +148,14 @@ public class WxRentContractController extends WxContractBaseController {
if(StringUtils.isBlank(wxRentContract.getBusDiscountRatio())){
wxRentContract.setBusDiscountTime(new Integer(0));
}
MallUserInfo user = getUser();
//MallUserInfo user = getUser();
MallUserInfo user = new MallUserInfo();
user.setId(321127266275430400L);
user.setName("alitest");
user.setTenantId("789");
user.setParentTenantId("788");
wxRentContract.updateTenantInfo(user);
//wxRentContract.setTenantId("789");
wxRentContract.setAdjustPeriodHandle();
wxRentContract.setRentPriceHandle();
Date oldDate = wxRentContract.getRentalStartDate();
@@ -711,6 +716,26 @@ public class WxRentContractController extends WxContractBaseController {
return wxRentContractService.getContractByContractNumber(wxRentContract);
}

@GetMapping("/init")
public ResultData init() {
List<WxRentContract> clist = wxRentContractService.findList(new WxRentContract());
for (WxRentContract wrc: clist) {
List<Long> shopIds = wrc.shopIdsByRentInfo();
if (null != shopIds) {
List<WxShop> shops = wxShopService.getByIds(shopIds);
String shopName = "";
for (WxShop shop : shops) {
shopName = shopName +","+shop.getShopNumber();
}
if(!StringUtils.isBlank(shopName)) {
wrc.setShopName(shopName);
wxRentContractService.updateRentContract(wrc);
}
}
}
return new ResultData();
}

}


+ 2
- 0
mallinkAdmin/src/main/resources/db/migration/V202007311200__FOR_MEMBER_ONLY_001.sql Просмотреть файл

@@ -73,6 +73,8 @@ UPDATE wx_rent_contract SET STATUS = 10 WHERE STATUS = 8 AND apply_status = 1;

UPDATE wx_rent_contract SET STATUS = 1 WHERE STATUS = 9;

UPDATE wx_rent_contract wrc INNER JOIN wx_shop s ON wrc.shop_id = s.id SET rent_info = JSON_ARRAY(s.*) WHERE wrc.rent_info IS NULL;






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

@@ -15,5 +15,7 @@ public interface WxMerchantShopMapper extends CommonMapper<WxMerchantShop, Strin

void delShops(@Param("merchantId") Long merchantId,@Param("shopList") List<Long> shopIds);
void realDelByMerchantId(@Param("merchantId") Long merchantId);
}

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

@@ -456,9 +456,25 @@ public class WxMerchantServiceImpl implements WxMerchantService {
return new ResultData(ErrorCode.MERCHANT_NAME_IS_FOUND);
}
}
final IdWorker idWorker = IdWorker.get();
Date date = new Date();
wxMerchant.setUpdateDate(date);
wxMerchantMapper.updateById(wxMerchant);
//更新商户的商铺
wxMerchantShopMapper.realDelByMerchantId(wxMerchant.getId());
List<Long> shopIds = wxMerchant.getShopids();
for (Long sid: shopIds) {
WxMerchantShop mcs = new WxMerchantShop();
mcs.setMerchantId(wxMerchant.getId());
mcs.setShopId(sid);
mcs.setIsDel(EnumDelStatus.NOT_DEL.getCode());
mcs.setId(idWorker.nextId());
mcs.updateTenantInfo(wxMerchant);
Date shopdate = new Date();
mcs.setUpdateDate(shopdate);
mcs.setCreateDate(shopdate);
wxMerchantShopMapper.insert(mcs);
}
return new ResultData(Result.SUCCESS, "商户更新成功");
} catch (Exception e) {
logger.error("db failed: 商户更新失败, e:" + e.getMessage());


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

@@ -83,5 +83,9 @@
</foreach>
</update>
<delete id="realDelByMerchantId" parameterType="Long">
delete from wx_merchant_shop where merchant_id = #{merchantId}
</delete>
</mapper>

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