fix

Helius

2021-11-10 ea5ec6cc6839485487e6eb8cb8e166eeec31db46

 gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java

@@ -65,9 +65,10 @@
        String name = StrUtil.isEmpty(model.getName())?model.getName():StringUtils.encode(model.getName());
        String orderNo = model.getOrderNo();
        List<Integer> status = new ArrayList<>();
        if(CollUtil.isNotEmpty(status)){
        if(CollUtil.isNotEmpty(model.getStatus())){
            status = model.getStatus();
        }else{
        }
        if(CollUtil.isEmpty(model.getStatus())){
            status.add(1);
            status.add(2);
            status.add(3);
@@ -270,8 +271,8 @@
        if (StrUtil.isNotBlank(addressInfo.getTagName())) {
            address.append(StrUtil.isNotBlank(addressInfo.getHouseName()) ? addressInfo.getHouseName() : "");
            if (Constants.ADDRESS_TYPE_HOME.equals(addressInfo.getTagName())) {
                address.append(StrUtil.isNotBlank(addressInfo.getHouseNumber()) ? addressInfo.getHouseNumber() : "");
                address.append(StrUtil.isNotBlank(addressInfo.getUnitName()) ? addressInfo.getUnitName() : "");
                address.append(StrUtil.isNotBlank(addressInfo.getHouseNumber()) ? addressInfo.getHouseNumber() : "");
            }
        }
        expressInfo.setAddress(address.toString());