diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java index 51c99868a..f942329df 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java @@ -110,15 +110,15 @@ public class WxCouponOrderController extends BaseController { } //TODO 待优化数据 -// @ApiOperation("交易流水分页列表接口") -// @GetMapping("listUnverified") -// @ApiImplicitParams({ -// @ApiImplicitParam(name = "date", value = "日期yyyy-MM-dd", dataType = "string", paramType = "query"), -// @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), -// @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) -// public ResultData listUnverified(String date, Integer pageNum, Integer pageSize) { -// return wxCouponOrderService.listOnDateAsPage(getLoginBUser().getId(), date, pageNum, pageSize, false); -// } + @ApiOperation("交易流水分页列表接口") + @GetMapping("listUnverified") + @ApiImplicitParams({ + @ApiImplicitParam(name = "date", value = "日期yyyy-MM-dd", dataType = "string", paramType = "query"), + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + public ResultData listUnverified(String date, Integer pageNum, Integer pageSize) { + return wxCouponOrderService.listOnDateAsPage(getLoginBUser().getId(), date, pageNum, pageSize, false); + } // // @ApiOperation("核销流水分页列表接口") // @GetMapping("listVerified") diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java index fbefe0de8..4958479e5 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java @@ -162,8 +162,8 @@ public class WxCouponOrderBVo extends WxCouponOrder { private String shopNumber; /**发券商户信息*/ - @io.swagger.annotations.ApiModelProperty(value="商户列表",name="merchantVoList") - private List merchantVoList; +// @io.swagger.annotations.ApiModelProperty(value="商户列表",name="merchantVoList") +// private List merchantVoList; /**发券渠道信息*/ @io.swagger.annotations.ApiModelProperty(value="商户列表",name="channelType") diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCUserBasicInfoMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCUserBasicInfoMapper.java index ae5167d19..00ebed669 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCUserBasicInfoMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCUserBasicInfoMapper.java @@ -18,7 +18,7 @@ public interface WxCUserBasicInfoMapper extends CommonMapper findListByFilter(WxCUserBasicInfoDto dto); List findListByFilter1(@Param("tenantInfo")TenantEntity tenantInfo, @Param("basicInfo")WxCUserBasicInfoDto wxCUserBasicInfo); - + List findList(WxCUserBasicInfo wxCUserBasicInfo); List findList1(@Param("tenantInfo")TenantEntity tenantInfo, @Param("basicInfo")WxCUserBasicInfo wxCUserBasicInfo); diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCouponOrderMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCouponOrderMapper.java index 76f654515..789763819 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCouponOrderMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCouponOrderMapper.java @@ -44,8 +44,8 @@ public interface WxCouponOrderMapper extends CommonMapper { List findCarListOfCUser(WxCouponOrder wxCouponOrder); - List findListOfOrderedByDateForBUser(Map dateMap); - List findListOfVerifiedByDateForBUser(Map dateMap); + List findListOfOrderedByDateForBUser(Map dateMap); + List findListOfVerifiedByDateForBUser(Map dateMap); //@Deprecated //List findListOfCUser(WxCouponOrder wxCouponOrder); @@ -53,8 +53,8 @@ public interface WxCouponOrderMapper extends CommonMapper { WxCouponOrderCVo findDetailOfCUser(@Param("id")Long id,@Param("tenantId")String tenantId); WxCouponOrderCVo findSimpleDetailOfCUser(@Param("id")Long id,@Param("tenantId")String tenantId); - List findListOfAdmin(WxCouponOrderBVo wxCouponOrder); - WxCouponOrderBVo findDetailOfAdmin(@Param("id")Long id,@Param("tenantId")String tenantId,@Param("finalTenantId")String finalTenantId); + List findListOfAdmin(WxCouponOrderBVo wxCouponOrder); + WxCouponOrder findDetailOfAdmin(@Param("id")Long id,@Param("tenantId")String tenantId,@Param("finalTenantId")String finalTenantId); //营销报表 券数据图表 List couponDataMap(HashMap params); diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantBUserMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantBUserMapper.java index 7675d5b29..b967ba478 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantBUserMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantBUserMapper.java @@ -10,6 +10,8 @@ public interface WxMerchantBUserMapper extends CommonMapper findList(WxMerchantBUser wxMerchantBUser); List findIdList(WxMerchantBUser wxMerchantBUser); + List findSimpleList(WxMerchantBUser wxMerchantBUser); + List findMerchantIdListByIds(WxMerchantBUser wxMerchantBUser); List findSelMerchantList(WxMerchantBUser wxMerchantBUser); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java index c1eeb642e..0c123e1ba 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -36,6 +36,7 @@ import com.iformall.utils.DateUtils; import com.iformall.utils.PayUtils; import com.iformall.utils.RedisLock; +import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -48,6 +49,8 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + +import java.lang.reflect.InvocationTargetException; import java.math.BigDecimal; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -264,14 +267,216 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { resultMap.put("amount", list.stream().mapToInt(p -> p.getCouponPrice()).sum()); resultMap.put("orderCount", list.size()); } else { - if (isVerified) - resultMap.put("list", PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponOrderMapper.findListOfVerifiedByDateForBUser(dateMap))); - else - resultMap.put("list", PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponOrderMapper.findListOfOrderedByDateForBUser(dateMap))); + if (isVerified) { + resultMap.put("list", findListOfVerifiedByDateForBUser(wxMerchant,wxMerchant.getId(),startDate,endDate,pageIndex,pageSize)); + }else { + resultMap.put("list", findListOfOrderedByDateForBUser(wxMerchant,wxMerchant.getId(),startDate,endDate,pageIndex,pageSize)); + } } return new ResultData(resultMap); } + private PageInfo findListOfVerifiedByDateForBUser(TenantEntity tenantEntity,Long merchantId,Date startDate,Date endDate,Integer pageIndex,Integer pageSize) { + Map dateMap = new HashMap(); + dateMap.put("startDate", startDate); + dateMap.put("endDate", endDate); + + WxMerchantBUser merchantBUserQ = new WxMerchantBUser(); + merchantBUserQ.updateTenantInfo(tenantEntity); + merchantBUserQ.setMerchantId(merchantId); + List bUserIds = wxMerchantBUserMapper.findIdList(merchantBUserQ); + dateMap.put("bUserIds", bUserIds); + + PageInfo couponOrderPage = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() ->wxCouponOrderMapper.findListOfVerifiedByDateForBUser(dateMap)); + PageInfo pageInfo = new PageInfo(); + pageInfo.setList(handleToCouponOrderBVoList(tenantEntity,couponOrderPage.getList())); + pageInfo.setPageNum(couponOrderPage.getPageNum()); + pageInfo.setPageSize(couponOrderPage.getPageSize()); + pageInfo.setPages(couponOrderPage.getPages()); + return pageInfo; + } + + private PageInfo findListOfOrderedByDateForBUser(TenantEntity tenantEntity,Long merchantId,Date startDate,Date endDate,Integer pageIndex,Integer pageSize) { + Map dateMap = new HashMap(); + dateMap.put("startDateTimes", startDate.getTime()); + dateMap.put("endDateTimes", endDate.getTime()); + List merchantIdList = new ArrayList(); + merchantIdList.add(merchantId); + List merchantProductVos = wxCouponMerchantMapper.findMerchantProduct(tenantEntity.getTenantId(), merchantIdList); + if (null != merchantProductVos) { + List couponIds = new ArrayList(); + for (int i = 0 ; i < merchantProductVos.size(); i ++) { + WxMerchantProductVo mp = merchantProductVos.get(i); + if (mp.getMc() == 1) { + if (!couponIds.contains(mp.getProductId())) { + couponIds.add(mp.getProductId()); + } + } + } + if (couponIds.size() > 0 ) { + dateMap.put("couponIds", couponIds); + } + } + + PageInfo couponOrderPage = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() ->wxCouponOrderMapper.findListOfOrderedByDateForBUser(dateMap)); + PageInfo pageInfo = new PageInfo(); + pageInfo.setList(handleToCouponOrderBVoList(tenantEntity,couponOrderPage.getList())); + pageInfo.setPageNum(couponOrderPage.getPageNum()); + pageInfo.setPageSize(couponOrderPage.getPageSize()); + pageInfo.setPages(couponOrderPage.getPages()); + return pageInfo; + } + + private List handleToCouponOrderBVoList(TenantEntity tenantEntity,List couponOrderList) { + List retList = null; + if (null != couponOrderList && couponOrderList.size() > 0 ) { + retList = new ArrayList(); + + List bUserIdList = new ArrayList(); + List cUserIdList = new ArrayList(); + List couponIdList = new ArrayList(); + for (int j = 0 ; j < couponOrderList.size(); j ++) { + WxCouponOrder co = couponOrderList.get(j); + Long bUserId = co.getBUserId(); + if (null != bUserId && (!bUserIdList.contains(bUserId))) { + bUserIdList.add(bUserId); + } + + Long cUserId = co.getcUserId(); + if (null != cUserId && (!cUserIdList.contains(cUserId))) { + cUserIdList.add(cUserId); + } + + Long couponId = co.getCouponId(); + if (null != couponId && (!couponIdList.contains(couponId))) { + couponIdList.add(couponId); + } + } + + //获取到buserId + Map bUserMap = new HashMap(); + List merchantIdList = null; + if (bUserIdList.size() > 0 ) { + merchantIdList = new ArrayList(); + WxMerchantBUser merchantBUserQ = new WxMerchantBUser(); + merchantBUserQ.updateTenantInfo(tenantEntity); + merchantBUserQ.setIds(bUserIdList); + List bUserList = wxMerchantBUserMapper.findSimpleList(merchantBUserQ); + if (null != bUserList) { + for (int k = 0 ; k < bUserList.size() ; k++) { + WxMerchantBUser b = bUserList.get(k); + bUserMap.put(b.getId(), b); + if (!merchantIdList.contains(b.getMerchantId())) { + merchantIdList.add(b.getMerchantId()); + } + } + } + } + + //merchant + Map merchantSimpleMap = new HashMap(); + if (null != merchantIdList) { + WxMerchant merchantQ = new WxMerchant(); + merchantQ.updateTenantInfo(tenantEntity); + merchantQ.setIds(merchantIdList); + List merchantList = wxMerchantMapper.findIdNameList(merchantQ); + if (null != merchantList) { + for (int k = 0 ; k < merchantList.size() ; k++) { + WxMerchant m = merchantList.get(k); + merchantSimpleMap.put(m.getId(), m); + } + } + } + + //获取到cUserId + Map cUserSimpleMap = new HashMap(); + if (cUserIdList.size() > 0 ) { + WxCUserBasicInfo cBasicInfoQ = new WxCUserBasicInfo(); + cBasicInfoQ.setFinalTenantId(tenantEntity.getFinalTenantId()); + cBasicInfoQ.setIds(cUserIdList); + List cUserBasicInfoList = wxCUserBasicInfoMapper.findListPhoneAndNameByIds(cBasicInfoQ); + if (null != cUserBasicInfoList) { + for (int k = 0 ; k < cUserBasicInfoList.size() ; k++) { + WxCUserBasicInfo cbi = cUserBasicInfoList.get(k); + cUserSimpleMap.put(cbi.getId(), cbi); + } + } + } + + //获取coupon + Map couponMap = new HashMap(); + if (couponIdList.size() > 0 ) { + WxCoupon couponQ = new WxCoupon(); + couponQ.updateTenantInfo(tenantEntity); + couponQ.setIds(couponIdList); + List couponList = wxCouponMapper.findTenantSimpleList(couponQ); + if (null != couponList) { + for (int k = 0 ; k < couponList.size() ; k++) { + WxCoupon c = couponList.get(k); + couponMap.put(c.getId(), c); + } + } + } + + for (int i = 0 ; i < couponOrderList.size() ; i ++) { + WxCouponOrder couponOrder = couponOrderList.get(i); + WxCouponOrderBVo bvo = couponOrdertoBVo(couponOrder,bUserMap,merchantSimpleMap,cUserSimpleMap,couponMap); + if (null != bvo ) { + retList.add(bvo); + } + } + } + return retList; + } + + private WxCouponOrderBVo couponOrdertoBVo(WxCouponOrder couponOrder,Map bUserMap,Map merchantSimpleMap,Map cUserSimpleMap,Map couponMap) { + WxCouponOrderBVo bvo = new WxCouponOrderBVo(); + try { + BeanUtils.copyProperties(bvo, couponOrder); + if (null != bvo.getBUserId()) { + WxMerchantBUser b = bUserMap.get(bvo.getBUserId()); + if (null != b) { + bvo.setbUserName(b.getName()); + bvo.setBUserPhone(b.getPhone()); + WxMerchant merchant = merchantSimpleMap.get(b.getMerchantId()); + if (null != merchant) { + bvo.setMerchantName(merchant.getName()); + bvo.setMerchantId(merchant.getId()); + } + } + } + if (null != bvo.getCUserId()) { + WxCUserBasicInfo cbi = cUserSimpleMap.get(bvo.getCUserId()); + if (null != cbi) { + bvo.setcUserPhone(cbi.getPhone()); + } + } + if (null != bvo.getCouponId()) { + WxCoupon coupon = couponMap.get(bvo.getCouponId()); + if (null != coupon) { + bvo.setType(coupon.getType()); + bvo.setTitle(coupon.getTitle()); + bvo.setSalePrice(coupon.getSalePrice()); + bvo.setUsePrice(coupon.getUsePrice()); + bvo.setPrice(coupon.getPrice()); + bvo.setAutoRefund(coupon.getAutoRefund()); + bvo.setBusiness(coupon.getBusiness()); + bvo.setSubsidyType(coupon.getSubsidyType()); + + //c.type,c.title,c.sale_price,c.use_price,c.price,c.unit,c.auto_refund,c.business,c.subsidy_type,, + } + } + + bvo.setSubsidyNum(bvo.getSubsidy()); + return bvo; + } catch (IllegalAccessException e) { + e.printStackTrace(); + } catch (InvocationTargetException e) { + e.printStackTrace(); + } + return null; + } + //@Override //public PageInfo listCUserVoAsPage(WxCouponOrder record, Integer pageIndex, Integer pageSize) { // @@ -339,14 +544,20 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { @Override public ResultData listAdminAsPage(WxCouponOrderBVo wxCouponOrderBVo, Integer pageIndex, Integer pageSize) { handleWxCouponOrderBVoQueryParam(wxCouponOrderBVo); - PageInfo pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponOrderMapper.findListOfAdmin(wxCouponOrderBVo)); + + PageInfo pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponOrderMapper.findListOfAdmin(wxCouponOrderBVo)); + PageInfo retPageInfo = new PageInfo(); + retPageInfo.setPageNum(pageIndex); + retPageInfo.setPageSize(pageSize); + retPageInfo.setPages(pageInfo.getPages()); if (null != pageInfo && null != pageInfo.getList()){ - handleQueryResult(pageInfo.getList(), wxCouponOrderBVo); + List volist = handleQueryResult(pageInfo.getList(), wxCouponOrderBVo); + retPageInfo.setList(volist); } - return new ResultData(pageInfo); + return new ResultData(retPageInfo); } - private void handleQueryResult(List list,TenantEntity tenantEntity) { + private List handleQueryResult(List list,TenantEntity tenantEntity) { if (null != list ) { WxMerchant merchantQ = new WxMerchant(); @@ -389,7 +600,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { List cUserIdList = new ArrayList(); List bUserIdList = new ArrayList(); for (int i = 0 ; i < list.size() ; i ++ ) { - WxCouponOrderBVo bo = list.get(i); + WxCouponOrder bo = list.get(i); Long cusrid = bo.getcUserId(); if (null != cusrid && (!cUserIdList.contains(cusrid))) { cUserIdList.add(cusrid); @@ -427,65 +638,69 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { } } + List retList = new ArrayList(); for (int i = 0 ; i < list.size() ; i ++) { - WxCouponOrderBVo co = list.get(i); - if (co.getCouponOrderStatus().equals(EnumCouponOrderStatus.COUPON_ORDER_USE_WAIT.getCode())) { - co.setUpdateDate(null); - } - if (null != co.getSendMerchantId()) { - co.setSendMerchantName(merchantNameMap.get(co.getSendMerchantId())); - } - WxCoupon coupon = couponMap.get(co.getCouponId()); - if (null != coupon) { - co.setTitle(coupon.getTitle()); - co.setSalePrice(coupon.getSalePrice()); - co.setUsePrice(coupon.getUsePrice()); - co.setPrice(coupon.getPrice()); - co.setAutoRefund(coupon.getAutoRefund()); - co.setBusiness(coupon.getBusiness()); - co.setSubsidyType(coupon.getSubsidyType()); - co.setSourceType(coupon.getSourceType()); - } - -// WxMerchantSubsidy merchantSubsidyQ = new WxMerchantSubsidy(); -// merchantSubsidyQ.setCouponOrderId(co.getId()); -// merchantSubsidyQ.setCouponType(co.getCouponType()); -// merchantSubsidyQ.setType(EnumMerchantSubsidyType.MANUAL.getCode()); -// merchantSubsidyQ.updateTenantInfo(co); -// List msList = wxMerchantSubsidyMapper.selectList(new QueryWrapper(merchantSubsidyQ)); -// if (msList.size() > 0) { -// co.setSubsidyNum(msList.get(0).getSubsidy()); -// } - co.setSubsidyNum(co.getSubsidy()); - - Long merchanId = merchantProductIdMap.get(co.getCouponId()); - if (null != merchanId) { - if (merchanId == -999L) { - co.setMerchantName("多商户通用"); - co.setMerchantId(0L); - }else { - co.setMerchantName(merchantNameMap.get(merchanId)); - co.setMerchantId(merchanId); - } - } - - //WxCUserBasicInfo basicInfo = wxCUserBasicInfoService.getById(co.getCUserId(), co.getFinalTenantId()); - WxCUserBasicInfo basicInfo = cUserMap.get(co.getCUserId()); - if (null != basicInfo) { - co.setcuserPhone(basicInfo.getPhone()); - co.setUserNickName(basicInfo.getNickName()); - } - - //WxMerchantBUser buser = wxMerchantBUserService.getById(co.getBUserId()); - Long buserMechantId = buserMerchantIdMap.get(co.getBUserId()); - if (null != buserMechantId) { - co.setVerifyMerchantName(merchantNameMap.get(buserMechantId)); - } - //co.setChannelType();) - + + WxCouponOrder coo = list.get(i); + WxCouponOrderBVo co = new WxCouponOrderBVo(); + + try { + BeanUtils.copyProperties(co, coo); + + if (co.getCouponOrderStatus().equals(EnumCouponOrderStatus.COUPON_ORDER_USE_WAIT.getCode())) { + co.setUpdateDate(null); + } + if (null != co.getSendMerchantId()) { + co.setSendMerchantName(merchantNameMap.get(co.getSendMerchantId())); + } + WxCoupon coupon = couponMap.get(co.getCouponId()); + if (null != coupon) { + co.setTitle(coupon.getTitle()); + co.setSalePrice(coupon.getSalePrice()); + co.setUsePrice(coupon.getUsePrice()); + co.setPrice(coupon.getPrice()); + co.setAutoRefund(coupon.getAutoRefund()); + co.setBusiness(coupon.getBusiness()); + co.setSubsidyType(coupon.getSubsidyType()); + co.setSourceType(coupon.getSourceType()); + } + + co.setSubsidyNum(co.getSubsidy()); + + Long merchanId = merchantProductIdMap.get(co.getCouponId()); + if (null != merchanId) { + if (merchanId == -999L) { + co.setMerchantName("多商户通用"); + co.setMerchantId(0L); + }else { + co.setMerchantName(merchantNameMap.get(merchanId)); + co.setMerchantId(merchanId); + } + } + + WxCUserBasicInfo basicInfo = cUserMap.get(co.getCUserId()); + if (null != basicInfo) { + co.setcuserPhone(basicInfo.getPhone()); + co.setUserNickName(basicInfo.getNickName()); + } + + Long buserMechantId = buserMerchantIdMap.get(co.getBUserId()); + if (null != buserMechantId) { + co.setVerifyMerchantName(merchantNameMap.get(buserMechantId)); + } + //co.setChannelType();) + + retList.add(co); + } catch (IllegalAccessException e) { + e.printStackTrace(); + } catch (InvocationTargetException e) { + e.printStackTrace(); + } } + return retList; } + return null; } @@ -576,7 +791,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { wxCouponOrder.setCUserId(basicInfo.getId()); }else { //throw new MallinkException(ErrorCode.USER_IS_EMPTY.getCode(),"手机号查询不到会员信息。"); - wxCouponOrder.setCUserId(-999L); + wxCouponOrder.setId(-999L); return; } } @@ -588,9 +803,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { merchantProductIds = wxCouponMerchantMapper.findMerchantProductIds(wxCouponOrder.getTenantId(), merchantIdListQueryParam); if (null == merchantProductIds || merchantProductIds.size() <= 0) { //throw new MallinkException(ErrorCode.USER_IS_EMPTY.getCode(),"商户下查询不到券信息。"); - List tempCouponIds = new ArrayList(); - tempCouponIds.add(-999L); - wxCouponOrder.setCouponIds(tempCouponIds); + wxCouponOrder.setId(-999L); return; } } @@ -608,9 +821,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { couponIds = wxCouponMapper.findIdList(wxCouponQuery); if (null == couponIds || couponIds.size() <= 0) { //throw new MallinkException(ErrorCode.USER_IS_EMPTY.getCode(),"根据券条件搜索不到券信息。"); - List tempCouponIds = new ArrayList(); - tempCouponIds.add(-999L); - wxCouponOrder.setCouponIds(tempCouponIds); + wxCouponOrder.setId(-999L); return; } } @@ -637,9 +848,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { List merchantIds = wxMerchantMapper.findIdList(merchantQ2); if (null == merchantIds || merchantIds.size() <= 0 ){ //throw new MallinkException(ErrorCode.USER_IS_EMPTY.getCode(),"核销商户名称查询不到商户记录."); - List tempBUserIds = new ArrayList(); - tempBUserIds.add(-999L); - wxCouponOrder.setBUserIdList(tempBUserIds); + wxCouponOrder.setId(-999L); return; } @@ -648,9 +857,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { List bUserIdList = wxMerchantBUserMapper.findIdList(merchantBUserQ); if (null == bUserIdList || bUserIdList.size() <= 0 ){ //throw new MallinkException(ErrorCode.USER_IS_EMPTY.getCode(),"核销商户下查询不到员工信息."); - List tempBUserIds = new ArrayList(); - tempBUserIds.add(-999L); - wxCouponOrder.setBUserIdList(tempBUserIds); + wxCouponOrder.setId(-999L); return; } wxCouponOrder.setBUserIdList(bUserIdList); @@ -662,10 +869,16 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { @Override public ResultData detailAdminVo(Long couponOrderId,TenantEntity tenantinfo) { - WxCouponOrderBVo wxCouponOrderBVo = wxCouponOrderMapper.findDetailOfAdmin(couponOrderId,tenantinfo.getTenantId(),tenantinfo.getFinalTenantId()); - if (wxCouponOrderBVo == null) + WxCouponOrder couponOrder = wxCouponOrderMapper.findDetailOfAdmin(couponOrderId,tenantinfo.getTenantId(),tenantinfo.getFinalTenantId()); + if (null == couponOrder) { + return new ResultData(ErrorCode.COUPON_ORDER_IS_NULL); + } + List couponOrderList = new ArrayList(); + couponOrderList.add(couponOrder); + List wxCouponOrderBVoList = handleToCouponOrderBVoList(tenantinfo,couponOrderList); + if (wxCouponOrderBVoList == null || wxCouponOrderBVoList.size() <= 0 ) return new ResultData(ErrorCode.COUPON_ORDER_IS_NULL); - return new ResultData(wxCouponOrderBVo); + return new ResultData(wxCouponOrderBVoList.get(0)); } @Override @@ -675,9 +888,9 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { filename = "商品订单"; } handleWxCouponOrderBVoQueryParam(wxCouponOrder); - List list = wxCouponOrderMapper.findListOfAdmin(wxCouponOrder); - handleQueryResult(list,wxCouponOrder); - excelService.exportCsv(list, null, filename, WxCouponOrderBVo.class, filename + ".csv", response, false); + List list = wxCouponOrderMapper.findListOfAdmin(wxCouponOrder); + List bolist = handleQueryResult(list,wxCouponOrder); + excelService.exportCsv(bolist, null, filename, WxCouponOrderBVo.class, filename + ".csv", response, false); } private WxAppinfo getAppinfo(TenantEntity tenantEntity,Integer payWay) { diff --git a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml index 2481c7925..f53b74d9d 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml @@ -254,8 +254,7 @@ - - + + + + + + update wx_coupon_order set `coupon_order_status` = #{couponOrderStatus}, @@ -779,57 +823,6 @@ and shipping_type = 2 and shipping_status = 24 and coupon_order_status = 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -878,21 +871,16 @@ - - co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.coupon_type,co.c_user_id,co.owner_id,co.b_user_id, - co.order_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price,co.verify_type,co.verify_remark, co.pay_vendor, - co.`freight_price`,co.`shipping_type`,co.`shipping_address`,co.`shipping_status`,co.`delivery_info`, - c.type,c.title,c.sale_price,c.use_price,c.price,c.unit,c.auto_refund,c.business,c.subsidy_type,ms.subsidy subsidy_num, - bu.name, bu.phone as bphone, - cu.phone, - m.name as merchant_name,m.id as merchant_id - - select co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.coupon_type,co.c_user_id,co.owner_id,co.b_user_id,co.expired_time,co.coupon_order_status,co.order_id, co.create_date,co.update_date,co.coupon_price, co.verify_type, co.verify_remark,co.pay_vendor, co.`freight_price`,co.`shipping_type`,co.`shipping_address`,co.`shipping_status`,co.`delivery_info`,co.send_merchant_id,co.subsidy FROM wx_coupon_order co where co.`tenant_id` = #{tenantId} + + and co.`id` = #{id} + and co.coupon_type = #{couponType} @@ -972,9 +960,17 @@ order by ${sortColumns} - order by co.create_date desc,co.id desc + order by co.id desc + + + - - - - - co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.coupon_type,co.c_user_id,co.owner_id,co.b_user_id,co.order_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price,co.verify_type,co.verify_remark,co.pay_vendor, - co.`freight_price`,co.`shipping_type`,co.`shipping_address`,co.`shipping_status`,co.`delivery_info`, - c.type,c.title,c.sale_price,c.use_price,c.price,c.unit, - bu.name, - cu.phone - - - - co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.coupon_type,co.c_user_id,co.owner_id,co.b_user_id,co.order_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price,co.verify_type,co.verify_remark,co.pay_vendor, - co.`freight_price`,co.`shipping_type`,co.`shipping_address`,co.`shipping_status`,co.`delivery_info`, - c.type,c.title,c.sale_price,c.use_price,c.price,c.unit, - cu.phone - - - - - - - co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.coupon_type,co.c_user_id,co.owner_id,co.b_user_id, co.order_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price,co.verify_type,co.verify_remark,co.pay_vendor, diff --git a/mallinkService/src/main/resources/mapper/WxMerchantBUserMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantBUserMapper.xml index f8ef476eb..842c3f139 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantBUserMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantBUserMapper.xml @@ -114,6 +114,18 @@ from wx_merchant_b_user + +