Compare commits
No commits in common. "a1e5f53b458b5bc89ef50a90556b0da23ace41f8" and "aa211e592411c69377606ebba0b1b8940108f623" have entirely different histories.
a1e5f53b45
...
aa211e5924
|
|
@ -626,6 +626,4 @@ public interface CuMemberMapper extends BaseMapper<CuMember> {
|
|||
*/
|
||||
BdTradeWhiteConfig selectMemberByUnderBlood(@Param("pkMember") Long pkMember, @Param("memberType") Integer memberType);
|
||||
|
||||
String getSharePosterImage(@Param("userId") Long userId);
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -895,9 +895,4 @@ public interface ICuMemberService extends IService<CuMember> {
|
|||
*/
|
||||
BdTradeWhiteConfig selectMemberByUnderBlood(Long pkMember, Integer memberType);
|
||||
|
||||
/**
|
||||
* 获取用户体系分享图片
|
||||
* @return
|
||||
*/
|
||||
String getSharePosterImage();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3232,9 +3232,4 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
|
|||
return baseMapper.selectMemberByUnderBlood(pkMember, memberType);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getSharePosterImage() {
|
||||
return baseMapper.getSharePosterImage(SecurityUtils.getUserId());
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@ import cn.hutool.core.lang.tree.Tree;
|
|||
import cn.hutool.core.lang.tree.TreeNodeConfig;
|
||||
import cn.hutool.core.lang.tree.TreeUtil;
|
||||
import cn.hutool.core.util.ObjectUtil;
|
||||
import cn.hutool.json.JSONObject;
|
||||
import cn.hutool.json.JSONUtil;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
import com.hzs.common.core.annotation.RepeatSubmitSimple;
|
||||
|
|
@ -16,7 +15,6 @@ import com.hzs.common.core.enums.EGrade;
|
|||
import com.hzs.common.core.enums.ENoticeWebsiteType;
|
||||
import com.hzs.common.core.enums.EYesNo;
|
||||
import com.hzs.common.core.utils.PageUtils;
|
||||
import com.hzs.common.core.utils.sign.Base64Util;
|
||||
import com.hzs.common.core.web.controller.BaseController;
|
||||
import com.hzs.common.core.web.domain.AjaxResult;
|
||||
import com.hzs.common.core.web.page.TableDataInfo;
|
||||
|
|
@ -77,14 +75,6 @@ public class RetailMemberController extends BaseController {
|
|||
}
|
||||
return AjaxResult.success(retailMemberInfoVO);
|
||||
}
|
||||
@GetMapping("/get-shared-image")
|
||||
public AjaxResult getSharedImage() {
|
||||
JSONObject result = new JSONObject();
|
||||
String url = iCuMemberService.getSharePosterImage();
|
||||
result.set("url", url);
|
||||
result.set("base64", Base64Util.toUrlBase64(url));
|
||||
return AjaxResult.success(result);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取会员收益区域
|
||||
|
|
|
|||
|
|
@ -15,5 +15,4 @@ public interface IMemberRetailService {
|
|||
*/
|
||||
RetailMemberInfoVO getMemberInfo(Long pkMember);
|
||||
|
||||
String getSharePosterImage();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -91,15 +91,9 @@ public class MemberRetailServiceImpl implements IMemberRetailService {
|
|||
.pkCountry(cuMember.getPkCountry())
|
||||
.pkSettleCountry(cuMember.getPkSettleCountry())
|
||||
.isActivate(cuMember.getIsActivate())
|
||||
.sharePosterImage(cuMember.getSharePosterImage())
|
||||
.build();
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getSharePosterImage() {
|
||||
return iCuMemberService.getSharePosterImage();
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -141,10 +141,4 @@ public class RetailMemberInfoVO implements Serializable {
|
|||
*/
|
||||
private Integer isActivate;
|
||||
|
||||
|
||||
/**
|
||||
* 分享海报图片
|
||||
*/
|
||||
private String sharePosterImage;
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1887,7 +1887,6 @@
|
|||
<!-- 查询菜单用户 -->
|
||||
<select id="getMenuMember" resultType="com.hzs.common.domain.member.ext.CuMemberExt">
|
||||
select cm.*,
|
||||
bv.SHARE_POSTER_IMAGE as sharePosterImage,
|
||||
case
|
||||
when tmp1.pk_member is null then
|
||||
1
|
||||
|
|
@ -1933,7 +1932,6 @@
|
|||
and cms.APPROVE_STATUS = 5
|
||||
and cms.APPLY_STATUS = 5) tmp10
|
||||
on tmp10.pk_member = cm.pk_id
|
||||
left join BD_VERTEX bv on bv.PK_ID = cm.PK_VERTEX
|
||||
where cm.pk_id = #{pkMember}
|
||||
and cm.del_flag = 0
|
||||
</select>
|
||||
|
|
@ -2477,13 +2475,5 @@
|
|||
and t0.category = 0)
|
||||
where rownum = 1
|
||||
</select>
|
||||
<select id="getSharePosterImage" resultType="java.lang.String" parameterType="java.lang.Long">
|
||||
select
|
||||
bv.SHARE_POSTER_IMAGE AS sharePosterImage
|
||||
FROM
|
||||
cu_member cm
|
||||
LEFT JOIN BD_VERTEX bv ON bv.PK_ID = cm.PK_VERTEX
|
||||
where cm.PK_ID = ${userId}
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
|
|
|
|||
|
|
@ -100,7 +100,6 @@ public class BdVertexController extends BaseController {
|
|||
bdVertex.setPkMember(mb.getPkId());
|
||||
bdVertex.setSystemType(systemType);
|
||||
bdVertex.setRegionVertexPkId(vertexParam.getRegionVertexPkId());
|
||||
bdVertex.setSharePosterImage(vertexParam.getSharePosterImage());
|
||||
iBdVertexService.save(bdVertex);
|
||||
return AjaxResult.success();
|
||||
}
|
||||
|
|
@ -140,7 +139,6 @@ public class BdVertexController extends BaseController {
|
|||
bdVertex.setModifiedTime(new Date());
|
||||
bdVertex.setPkModified(SecurityUtils.getUserId());
|
||||
bdVertex.setRegionVertexPkId(vertexParam.getRegionVertexPkId());
|
||||
bdVertex.setSharePosterImage(vertexParam.getSharePosterImage());
|
||||
if (null == bdVertex.getPkParent()) {
|
||||
bdVertex.setPkParent(0);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -59,9 +59,4 @@ public class VertexParam {
|
|||
private Integer sort;
|
||||
|
||||
private Long regionVertexPkId;
|
||||
|
||||
/**
|
||||
* 分享海报图片
|
||||
*/
|
||||
private String sharePosterImage;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -52,9 +52,4 @@ public class VertexVo extends BaseEntity {
|
|||
|
||||
@TableField("REGION_VERTEX_PK_ID")
|
||||
private Long regionVertexPkId;
|
||||
|
||||
/**
|
||||
* 分享海报图片
|
||||
*/
|
||||
private String sharePosterImage;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -211,10 +211,4 @@ public class CuMemberExt extends CuMember {
|
|||
*/
|
||||
private String lastMemberCode;
|
||||
|
||||
|
||||
/**
|
||||
* 分享海报图片
|
||||
*/
|
||||
private String sharePosterImage;
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -57,7 +57,4 @@ public class BdVertex extends BaseEntity {
|
|||
|
||||
@TableField("REGION_VERTEX_PK_ID")
|
||||
private Long regionVertexPkId;
|
||||
|
||||
@TableField("SHARE_POSTER_IMAGE")
|
||||
private String sharePosterImage;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -131,14 +131,13 @@ public class JdPayNotifyController extends JdBaseController {
|
|||
String thirdOrderCode = successNotify.getOutTradeNo();
|
||||
// 订单编号
|
||||
String orderCode = thirdOrderCode;
|
||||
String acqOrderId = successNotify.getAcqOrderId();
|
||||
|
||||
// 订单金额
|
||||
int tradeAmount = Integer.parseInt(successNotify.getTradeAmount());
|
||||
BigDecimal payMoney = new BigDecimal(tradeAmount).divide(new BigDecimal("100"), 2, BigDecimal.ROUND_HALF_UP);
|
||||
Integer payType = convertPayType(successNotify.getPayTool());
|
||||
// 支付后续业务处理
|
||||
if (iPayService.notifyHandle(type, orderCode, thirdOrderCode, payNumber, payTime, payMoney, EPayChannel.JD, channelNumber, payType, acqOrderId)) {
|
||||
if (iPayService.notifyHandle(type, orderCode, thirdOrderCode, payNumber, payTime, payMoney, EPayChannel.JD, channelNumber, payType)) {
|
||||
return SUCCESS;
|
||||
}
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -95,5 +95,4 @@ public class JdPayTradeSuccessNotify implements Serializable {
|
|||
*/
|
||||
private String installmentNum;
|
||||
|
||||
private String acqOrderId;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ public interface IPayService {
|
|||
EPayChannel ePayChannel, String channelNumber);
|
||||
boolean notifyHandle(String businessType, String businessCode, String originalOrder,
|
||||
String payNumber, Date payTime, BigDecimal payMoney,
|
||||
EPayChannel ePayChannel, String channelNumber, Integer payType, String acqOrderId);
|
||||
EPayChannel ePayChannel, String channelNumber, Integer payType);
|
||||
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -107,9 +107,7 @@ public class PayServiceImpl implements IPayService {
|
|||
}
|
||||
|
||||
@Override
|
||||
public boolean notifyHandle(String businessType, String businessCode, String originalOrder, String payNumber,
|
||||
Date payTime, BigDecimal payMoney, EPayChannel ePayChannel, String channelNumber,
|
||||
Integer payType, String acqOrderId) {
|
||||
public boolean notifyHandle(String businessType, String businessCode, String originalOrder, String payNumber, Date payTime, BigDecimal payMoney, EPayChannel ePayChannel, String channelNumber, Integer payType) {
|
||||
// 校验支付信息状态、业务与支付金额是否一致等
|
||||
TOnlinePayment onlinePayment = itOnlinePaymentService.queryByBusiness(
|
||||
ObjectUtil.isNotEmpty(businessType) ? Integer.valueOf(businessType) : null
|
||||
|
|
@ -134,7 +132,6 @@ public class PayServiceImpl implements IPayService {
|
|||
onlinePayment.setPkModified(MagicNumberConstants.PK_ADMIN);
|
||||
onlinePayment.setModifiedTime(new Date());
|
||||
onlinePayment.setPayType(payType);
|
||||
onlinePayment.setChannelNumber(acqOrderId);
|
||||
if (null != ePayChannel) {
|
||||
onlinePayment.setPayChannel(ePayChannel.getValue());
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +0,0 @@
|
|||
ALTER TABLE "BD_VERTEX"
|
||||
ADD ("SHARE_POSTER_IMAGE" VARCHAR(200));
|
||||
|
||||
COMMENT ON COLUMN "BD_VERTEX"."SHARE_POSTER_IMAGE" IS '分享海报图'
|
||||
Loading…
Reference in New Issue