Explorar el Código

//add im buser

release_toaliyun_real
xhxu hace 4 años
padre
commit
52e9e1ceaa
Se han modificado 4 ficheros con 25 adiciones y 2 borrados
  1. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java
  2. +1
    -0
      mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java
  3. +22
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java
  4. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java

+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java Ver fichero

@@ -147,7 +147,7 @@ public class ShiroConfig {
filterChainDefinitionMap.put("/wxDeviceScreenAd/**", "anon"); filterChainDefinitionMap.put("/wxDeviceScreenAd/**", "anon");
// filterChainDefinitionMap.put("/role/**", "corsFilter,token"); // filterChainDefinitionMap.put("/role/**", "corsFilter,token");
//商场初始化init //商场初始化init
filterChainDefinitionMap.put("/wxProjectConfig/**", "anon");
// filterChainDefinitionMap.put("/wxProjectConfig/**", "anon");


// //test // //test
// filterChainDefinitionMap.put("/merchantPoi/spuSync", "anon"); // filterChainDefinitionMap.put("/merchantPoi/spuSync", "anon");


+ 1
- 0
mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java Ver fichero

@@ -136,6 +136,7 @@ public class WxCouponOrderBVo extends WxCouponOrder {


@io.swagger.annotations.ApiModelProperty(value="b端用户姓名",name="bUserName") @io.swagger.annotations.ApiModelProperty(value="b端用户姓名",name="bUserName")
private String bUserName; private String bUserName;
@Excel(name = "商户操作人", width = 50, orderNum = "5")
@io.swagger.annotations.ApiModelProperty(value="b端用户手机号",name="bUserPhone") @io.swagger.annotations.ApiModelProperty(value="b端用户手机号",name="bUserPhone")
private String bUserPhone; private String bUserPhone;
@Excel(name = "所属商户", width = 50, orderNum = "3") @Excel(name = "所属商户", width = 50, orderNum = "3")


+ 22
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java Ver fichero

@@ -843,6 +843,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
//循环list,获取 cUserId //循环list,获取 cUserId
List<Long> cUserIdList = new ArrayList<Long>(); List<Long> cUserIdList = new ArrayList<Long>();
List<Long> bUserIdList = new ArrayList<Long>();
// List<Long> merchantIdList = new ArrayList<Long>(); // List<Long> merchantIdList = new ArrayList<Long>();
List<Long> couponIdList = new ArrayList<Long>(); List<Long> couponIdList = new ArrayList<Long>();
for (int i = 0 ; i < list.size() ; i ++ ) { for (int i = 0 ; i < list.size() ; i ++ ) {
@@ -851,6 +852,11 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
if (null != cusrid && (!cUserIdList.contains(cusrid))) { if (null != cusrid && (!cUserIdList.contains(cusrid))) {
cUserIdList.add(cusrid); cUserIdList.add(cusrid);
} }
Long bUserId = bo.getBUserId();
if(null != bUserId && (!bUserIdList.contains(bUserId))){
bUserIdList.add(bUserId);
}

// Long bmerchantId = bo.getBMerchantId(); // Long bmerchantId = bo.getBMerchantId();
// if (null != bmerchantId && (!merchantIdList.contains(bmerchantId))) { // if (null != bmerchantId && (!merchantIdList.contains(bmerchantId))) {
// merchantIdList.add(bmerchantId); // merchantIdList.add(bmerchantId);
@@ -860,6 +866,19 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
couponIdList.add(couponId); couponIdList.add(couponId);
} }
} }

Map<Long,String> buserPhoneMap = new HashMap<Long,String>();
if(bUserIdList.size() > 0){
WxMerchantBUser buserQ = new WxMerchantBUser();
buserQ.updateTenantInfo(tenantEntity);
buserQ.setIds(bUserIdList);
List<WxMerchantBUser> bUserList = wxMerchantBUserMapper.findSimpleList(buserQ);
if(null != bUserList && bUserList.size() > 0){
for (WxMerchantBUser bUser: bUserList) {
buserPhoneMap.put(bUser.getId(),bUser.getPhone());
}
}
}
Map<Long,String> merchantNameMap = new HashMap<Long,String>(); Map<Long,String> merchantNameMap = new HashMap<Long,String>();
// if (null != merchantIdList && merchantIdList.size() > 0 ) { // if (null != merchantIdList && merchantIdList.size() > 0 ) {
@@ -990,6 +1009,9 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
co.setVerifyMerchantName(merchantNameMap.get(bMechantId)); co.setVerifyMerchantName(merchantNameMap.get(bMechantId));
} }
//co.setChannelType();) //co.setChannelType();)
if(null != co.getBUserId()){
co.setBUserPhone(buserPhoneMap.get(co.getBUserId()));
}
retList.add(co); retList.add(co);
} catch (IllegalAccessException e) { } catch (IllegalAccessException e) {


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java Ver fichero

@@ -236,7 +236,7 @@ public class WxTopicServiceImpl implements WxTopicService {
@Override @Override
public WxTopic findCById(WxTopic record) { public WxTopic findCById(WxTopic record) {
WxTopic wxTopic = wxTopicMapper.selectById(record.getId()); WxTopic wxTopic = wxTopicMapper.selectById(record.getId());
if(EnumWxTopicType.SPECIAL_TOPIC.getCode().equals(wxTopic.getTopicType())){
if(null != wxTopic && EnumWxTopicType.SPECIAL_TOPIC.getCode().equals(wxTopic.getTopicType())){
WxCouponChannel wxCouponChannel = new WxCouponChannel(); WxCouponChannel wxCouponChannel = new WxCouponChannel();
wxCouponChannel.updateTenantInfo(wxTopic); wxCouponChannel.updateTenantInfo(wxTopic);
wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode());


Cargando…
Cancelar
Guardar