记得上下班打卡 | git大法好,push需谨慎
Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
liquidnet-bus-v1
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
董敬伟
liquidnet-bus-v1
Commits
c7ac89fc
Commit
c7ac89fc
authored
Sep 22, 2021
by
张国柄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
+user_coupon降级DB;
parent
038cce49
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
71 additions
and
67 deletions
+71
-67
CandyMgtCouponAdminServiceImpl.java
...ai/candy/service/impl/CandyMgtCouponAdminServiceImpl.java
+20
-16
CandyCommonCouponMapper.xml
...iquidnet/service/candy/mapper/CandyCommonCouponMapper.xml
+51
-51
No files found.
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/candy/service/impl/CandyMgtCouponAdminServiceImpl.java
View file @
c7ac89fc
...
...
@@ -376,23 +376,27 @@ public class CandyMgtCouponAdminServiceImpl extends ServiceImpl<CandyMgtCouponMa
memberRightsCouponVoList
=
new
ArrayList
<>();
}
}
Integer
eventAmt
=
updateMgtCoupon
.
getEventAmt
();
for
(
int
i
=
0
;
i
<
eventAmt
;
i
++)
{
AdamMemberRightsCouponVo
memberRightsCouponVo
=
AdamMemberRightsCouponVo
.
getNew
();
memberRightsCouponVo
.
setMrightsId
(
updateMgtCoupon
.
getMcouponId
());
memberRightsCouponVo
.
setCouponId
(
updateCoupon
.
getCouponId
());
memberRightsCouponVo
.
setBusiType
(
updateCoupon
.
getBusiType
());
memberRightsCouponVo
.
setCouType
(
updateCoupon
.
getCouType
());
memberRightsCouponVo
.
setTitle
(
updateCoupon
.
getTitle
());
memberRightsCouponVo
.
setLabel
(
updateCoupon
.
getLabel
());
memberRightsCouponVo
.
setNotice
(
updateCoupon
.
getNotice
());
memberRightsCouponVo
.
setValFace
(
updateCoupon
.
getValFace
());
memberRightsCouponVo
.
setValOver
(
updateCoupon
.
getValOver
());
memberRightsCouponVo
.
setValMinus
(
updateCoupon
.
getValMinus
());
memberRightsCouponVo
.
setUseRules
(
memberRightsCouponRuleVoList
);
memberRightsCouponVoList
.
add
(
memberRightsCouponVo
);
if
(
updateCoupon
.
getState
()
==
1
)
{
Integer
eventAmt
=
updateMgtCoupon
.
getEventAmt
();
for
(
int
i
=
0
;
i
<
eventAmt
;
i
++)
{
AdamMemberRightsCouponVo
memberRightsCouponVo
=
AdamMemberRightsCouponVo
.
getNew
();
memberRightsCouponVo
.
setMrightsId
(
updateMgtCoupon
.
getMcouponId
());
memberRightsCouponVo
.
setCouponId
(
updateCoupon
.
getCouponId
());
memberRightsCouponVo
.
setBusiType
(
updateCoupon
.
getBusiType
());
memberRightsCouponVo
.
setCouType
(
updateCoupon
.
getCouType
());
memberRightsCouponVo
.
setTitle
(
updateCoupon
.
getTitle
());
memberRightsCouponVo
.
setLabel
(
updateCoupon
.
getLabel
());
memberRightsCouponVo
.
setNotice
(
updateCoupon
.
getNotice
());
memberRightsCouponVo
.
setValFace
(
updateCoupon
.
getValFace
());
memberRightsCouponVo
.
setValOver
(
updateCoupon
.
getValOver
());
memberRightsCouponVo
.
setValMinus
(
updateCoupon
.
getValMinus
());
memberRightsCouponVo
.
setUseRules
(
memberRightsCouponRuleVoList
);
memberRightsCouponVoList
.
add
(
memberRightsCouponVo
);
}
}
redisUtil
.
set
(
AdamRedisConst
.
INFO_MEMBER_RIGHTS_COUPON
.
concat
(
updateMgtCoupon
.
getMcouponId
()),
memberRightsCouponVoList
);
}
}
liquidnet-bus-do/liquidnet-service-candy-do/src/main/resources/com/liquidnet/service/candy/mapper/CandyCommonCouponMapper.xml
View file @
c7ac89fc
...
...
@@ -2,59 +2,59 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace=
"com.liquidnet.service.candy.mapper.CandyCommonCouponMapper"
>
<resultMap
id=
"Rst_UserCouponBasicDto"
type=
"com.liquidnet.service.candy.dto.CandyUserCouponBasicDto"
>
<result
column=
"coupon_id"
jdbcType=
"VARCHAR"
property=
"couponId"
/
>
<!-- <result column="state" jdbcType="TINYINT" property="state"/>
-->
<result
column=
"title"
jdbcType=
"VARCHAR"
property=
"title"
/
>
<result
column=
"label"
jdbcType=
"VARCHAR"
property=
"label"
/
>
<result
column=
"notice"
jdbcType=
"VARCHAR"
property=
"notice"
/
>
<result
column=
"exclusive"
jdbcType=
"SMALLINT"
property=
"exclusive"
/
>
<result
column=
"busi_type"
jdbcType=
"SMALLINT"
property=
"busiType"
/
>
<result
column=
"cou_type"
jdbcType=
"SMALLINT"
property=
"couType"
/
>
<result
column=
"bind_type"
jdbcType=
"SMALLINT"
property=
"bindType"
/
>
<result
column=
"discount"
jdbcType=
"DECIMAL"
property=
"discount"
/
>
<result
column=
"val_face"
jdbcType=
"DECIMAL"
property=
"valFace"
/
>
<result
column=
"val_over"
jdbcType=
"DECIMAL"
property=
"valOver"
/
>
<result
column=
"val_minus"
jdbcType=
"DECIMAL"
property=
"valMinus"
/
>
<result
column=
"overlay"
jdbcType=
"TINYINT"
property=
"overlay"
/
>
<result
column=
"overlay_level"
jdbcType=
"TINYINT"
property=
"overlayLevel"
/
>
<result
column=
"validity"
jdbcType=
"INTEGER"
property=
"validity"
/
>
<result
column=
"redeem_validity"
jdbcType=
"INTEGER"
property=
"redeemValidity"
/
>
<result
column=
"redeem_start"
jdbcType=
"TIMESTAMP"
property=
"redeemStart"
/
>
<result
column=
"redeem_stop"
jdbcType=
"TIMESTAMP"
property=
"redeemStop"
/
>
<result
column=
"effect_at"
jdbcType=
"TIMESTAMP"
property=
"effectAt"
/
>
<result
column=
"expire_at"
jdbcType=
"TIMESTAMP"
property=
"expireAt"
/
>
<!-- <result column="operator" jdbcType="VARCHAR" property="operator" />
-->
<!-- <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
-->
<!-- <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
-->
<!-- <result column="comment" jdbcType="VARCHAR" property="comment" />
-->
<!-- <resultMap id="Rst_UserCouponBasicDto" type="com.liquidnet.service.candy.dto.CandyUserCouponBasicDto">--
>
<!-- <result column="coupon_id" jdbcType="VARCHAR" property="couponId"/>--
>
<!-- <!– <result column="state" jdbcType="TINYINT" property="state"/>–>
-->
<!-- <result column="title" jdbcType="VARCHAR" property="title"/>--
>
<!-- <result column="label" jdbcType="VARCHAR" property="label"/>--
>
<!-- <result column="notice" jdbcType="VARCHAR" property="notice"/>--
>
<!-- <result column="exclusive" jdbcType="SMALLINT" property="exclusive"/>--
>
<!-- <result column="busi_type" jdbcType="SMALLINT" property="busiType"/>--
>
<!-- <result column="cou_type" jdbcType="SMALLINT" property="couType"/>--
>
<!-- <result column="bind_type" jdbcType="SMALLINT" property="bindType"/>--
>
<!-- <result column="discount" jdbcType="DECIMAL" property="discount"/>--
>
<!-- <result column="val_face" jdbcType="DECIMAL" property="valFace"/>--
>
<!-- <result column="val_over" jdbcType="DECIMAL" property="valOver"/>--
>
<!-- <result column="val_minus" jdbcType="DECIMAL" property="valMinus"/>--
>
<!-- <result column="overlay" jdbcType="TINYINT" property="overlay"/>--
>
<!-- <result column="overlay_level" jdbcType="TINYINT" property="overlayLevel"/>--
>
<!-- <result column="validity" jdbcType="INTEGER" property="validity"/>--
>
<!-- <result column="redeem_validity" jdbcType="INTEGER" property="redeemValidity"/>--
>
<!-- <result column="redeem_start" jdbcType="TIMESTAMP" property="redeemStart"/>--
>
<!-- <result column="redeem_stop" jdbcType="TIMESTAMP" property="redeemStop"/>--
>
<!-- <result column="effect_at" jdbcType="TIMESTAMP" property="effectAt"/>--
>
<!-- <result column="expire_at" jdbcType="TIMESTAMP" property="expireAt"/>--
>
<!-- <!– <result column="operator" jdbcType="VARCHAR" property="operator" />–>
-->
<!-- <!– <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />–>
-->
<!-- <!– <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />–>
-->
<!-- <!– <result column="comment" jdbcType="VARCHAR" property="comment" />–>
-->
<result
column=
"ucoupon_id"
jdbcType=
"VARCHAR"
property=
"ucouponId"
/
>
<!-- <result column="mcoupon_id" jdbcType="VARCHAR" property="mcouponId" />
-->
<result
column=
"uid"
jdbcType=
"VARCHAR"
property=
"uid"
/
>
<!-- <result column="coupon_id" jdbcType="VARCHAR" property="couponId" />
-->
<result
column=
"state"
jdbcType=
"TINYINT"
property=
"state"
/
>
<result
column=
"ccode"
jdbcType=
"VARCHAR"
property=
"ccode"
/
>
<result
column=
"bind_at"
jdbcType=
"TIMESTAMP"
property=
"bindAt"
/
>
<result
column=
"used_at"
jdbcType=
"TIMESTAMP"
property=
"usedAt"
/
>
<result
column=
"used_for"
jdbcType=
"VARCHAR"
property=
"usedFor"
/
>
<!-- <result column="comment" jdbcType="VARCHAR" property="comment" />
-->
</resultMap
>
<!-- <result column="ucoupon_id" jdbcType="VARCHAR" property="ucouponId"/>--
>
<!-- <!– <result column="mcoupon_id" jdbcType="VARCHAR" property="mcouponId" />–>
-->
<!-- <result column="uid" jdbcType="VARCHAR" property="uid"/>--
>
<!-- <!– <result column="coupon_id" jdbcType="VARCHAR" property="couponId" />–>
-->
<!-- <result column="state" jdbcType="TINYINT" property="state"/>--
>
<!-- <result column="ccode" jdbcType="VARCHAR" property="ccode"/>--
>
<!-- <result column="bind_at" jdbcType="TIMESTAMP" property="bindAt"/>--
>
<!-- <result column="used_at" jdbcType="TIMESTAMP" property="usedAt"/>--
>
<!-- <result column="used_for" jdbcType="VARCHAR" property="usedFor"/>--
>
<!-- <!– <result column="comment" jdbcType="VARCHAR" property="comment" />–>
-->
<!-- </resultMap>--
>
<sql
id=
"Rst_CommonCouponBasicDto_Column_List"
>
cc.coupon_id, cc.title, cc.`label`, cc.notice, cc.`exclusive`, cc.busi_type, cc.cou_type, cc.bind_type,
cc.discount, cc.val_face, cc.val_over, cc.val_minus, cc.`overlay`, cc.overlay_level,
cc.validity,cc.redeem_validity, cc.redeem_start, cc.redeem_stop,
<!-- <sql id="Rst_CommonCouponBasicDto_Column_List">--
>
<!-- cc.coupon_id, cc.title, cc.`label`, cc.notice, cc.`exclusive`, cc.busi_type, cc.cou_type, cc.bind_type,-->
<!-- cc.discount, cc.val_face, cc.val_over, cc.val_minus, cc.`overlay`, cc.overlay_level,-->
<!-- cc.validity,cc.redeem_validity, cc.redeem_start, cc.redeem_stop,-->
cuc.ucoupon_id, cuc.mcoupon_id, cuc.`uid`, cuc.`state`, cuc.ccode, cuc.bind_at, cuc.dued_at, cuc.used_at, cuc.used_for
</sql
>
<!-- cuc.ucoupon_id, cuc.mcoupon_id, cuc.`uid`, cuc.`state`, cuc.ccode, cuc.bind_at, cuc.dued_at, cuc.used_at, cuc.used_for-->
<!-- </sql>--
>
<select
id=
"selectMultiForCommonCouponBasicDto"
resultMap=
"Rst_CommonCouponBasicDto"
>
SELECT
<include
refid=
"Rst_CommonCouponBasicDto_Column_List"
/
>
FROM candy_user_coupon cuc
LEFT JOIN candy_coupon cc ON cuc.coupon_id = cc.coupon_id
WHERE cuc.uid = #{uid,jdbcType=VARCHAR}
AND state
<![CDATA[<>]]>
2
</select
>
<!-- <select id="selectMultiForCommonCouponBasicDto" resultMap="Rst_CommonCouponBasicDto">--
>
<!-- SELECT-->
<!-- <include refid="Rst_CommonCouponBasicDto_Column_List"/>--
>
<!-- FROM candy_user_coupon cuc-->
<!-- LEFT JOIN candy_coupon cc ON cuc.coupon_id = cc.coupon_id-->
<!-- WHERE cuc.uid = #{uid,jdbcType=VARCHAR}-->
<!-- AND state <![CDATA[<>]]> 2-->
<!-- </select>--
>
</mapper>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment