diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml index 181cefba4..25529f3f3 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml @@ -85,6 +85,24 @@ update_time, + + shop_code, + + + shop_name, + + + shop_id, + + + recommend_partner_id, + + + recommend_partner_name, + + + recommend_partner_mobile, + @@ -117,6 +135,24 @@ #{record.updateTime}, + + #{record.shopCode}, + + + #{record.shopName}, + + + #{record.shopId}, + + + #{record.recommendPartnerId}, + + + #{record.recommendPartnerName}, + + + #{record.recommendPartnerMobile}, + @@ -152,6 +188,24 @@ update_time = #{record.updateTime}, + + shop_code = #{record.shopCode}, + + + shop_name = #{record.shopName}, + + + shop_id = #{record.shopId}, + + + recommend_partner_id = #{record.recommendPartnerId}, + + + recommend_partner_name = #{record.recommendPartnerName}, + + + recommend_partner_mobile = #{record.recommendPartnerMobile}, + where id = #{record.id} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PartnerUserInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PartnerUserInfoServiceImpl.java index b568b8edd..ab28739b6 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PartnerUserInfoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PartnerUserInfoServiceImpl.java @@ -16,11 +16,13 @@ import com.cool.store.vo.ApplyBaseInfoVO; import com.cool.store.vo.InviteCodeDetailVO; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.List; +import java.util.Objects; @Service @Slf4j @@ -111,7 +113,9 @@ public class PartnerUserInfoServiceImpl implements PartnerUserInfoService { hyPartnerUserInfoDO.setMobile(partnerUserInfoRequest.getMobile()); hyPartnerUserInfoDO.setLiveArea(partnerUserInfoRequest.getLiveArea()); hyPartnerUserInfoDO.setWantShopArea(partnerUserInfoRequest.getWantShopArea()); - hyPartnerUserInfoDO.setAcceptAdjustType(partnerUserInfoRequest.getAcceptAdjustType()); + if (!Objects.isNull(partnerUserInfoRequest.getAcceptAdjustType())){ + hyPartnerUserInfoDO.setAcceptAdjustType(partnerUserInfoRequest.getAcceptAdjustType()); + } hyPartnerUserInfoDO.setInviteCode(partnerUserInfoRequest.getInviteCode()); hyPartnerUserInfoDO.setShopCode(partnerUserInfoRequest.getShopCode()); hyPartnerUserInfoDO.setShopName(partnerUserInfoRequest.getShopName());