From 9266fcff70128a9719d2e0ae0332c3780b121045 Mon Sep 17 00:00:00 2001 From: Administrator <zhubaomin> Date: 星期四, 11 七月 2024 20:23:02 +0800 Subject: [PATCH] 2024-07-11 朱宝民 更新55 --- /dev/null | 355 -------------------------------------------------- pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeClientCard.java | 3 pipIrr-platform/pipIrr-global/src/main/resources/application-database-sp.yml | 4 pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientCardMapper.xml | 19 ++ pipIrr-platform/pipIrr-global/src/main/resources/application-database-ym.yml | 4 5 files changed, 22 insertions(+), 363 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeClientCard.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeClientCard.java index bc9dad6..5ca5088 100644 --- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeClientCard.java +++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeClientCard.java @@ -44,6 +44,9 @@ @Schema(description = "瀹炰綋id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) private Long id; + @NotBlank(message = "閫氳鍗忚涓嶈兘涓虹┖") + private String protocol; + /** * 姘村崱鍦板潃 */ diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/application-database-sp.yml b/pipIrr-platform/pipIrr-global/src/main/resources/application-database-sp.yml index a4c1803..f9678d7 100644 --- a/pipIrr-platform/pipIrr-global/src/main/resources/application-database-sp.yml +++ b/pipIrr-platform/pipIrr-global/src/main/resources/application-database-sp.yml @@ -5,8 +5,8 @@ #name: sp type: com.alibaba.druid.pool.DruidDataSource driverClassName: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://192.168.40.166:3306/pipIrr_sp?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull -# url: jdbc:mysql://8.140.179.55:3306/pipIrr_sp?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull +# url: jdbc:mysql://192.168.40.166:3306/pipIrr_sp?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull + url: jdbc:mysql://127.0.0.1:3306/pipIrr_sp?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull username: root password: dysql,;.abc!@# druid: diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/application-database-ym.yml b/pipIrr-platform/pipIrr-global/src/main/resources/application-database-ym.yml index 3b1c640..ab10469 100644 --- a/pipIrr-platform/pipIrr-global/src/main/resources/application-database-ym.yml +++ b/pipIrr-platform/pipIrr-global/src/main/resources/application-database-ym.yml @@ -5,8 +5,8 @@ #name: ym type: com.alibaba.druid.pool.DruidDataSource driverClassName: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://192.168.40.166:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull -# url: jdbc:mysql://127.0.0.1:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull +# url: jdbc:mysql://192.168.40.166:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull + url: jdbc:mysql://127.0.0.1:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull # url: jdbc:mysql://8.140.179.55:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull username: root password: dysql,;.abc!@# diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientCardMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientCardMapper.xml index 35e5a3c..d828d9e 100644 --- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientCardMapper.xml +++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientCardMapper.xml @@ -5,6 +5,7 @@ <!--@mbg.generated--> <!--@Table se_client_card--> <id column="id" jdbcType="BIGINT" property="id" /> + <result column="protocol" jdbcType="VARCHAR" property="protocol" /> <result column="cardAddr" jdbcType="VARCHAR" property="cardaddr" /> <result column="cardNum" jdbcType="BIGINT" property="cardnum" /> <result column="clientId" jdbcType="BIGINT" property="clientid" /> @@ -25,7 +26,7 @@ </resultMap> <sql id="Base_Column_List"> <!--@mbg.generated--> - id, cardAddr, cardNum, clientId, money, `state`, original_card_id, createDt, replaceDt, rechargeDt, + id, protocol, cardAddr, cardNum, clientId, money, `state`, original_card_id, createDt, replaceDt, rechargeDt, lossDtDt, cancelDt, unlockDt, reversalDt, refundDt, consumeDt, lastOper, remarks </sql> <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap"> @@ -84,13 +85,13 @@ <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pipIrrGlobal.pojoSe.SeClientCard"> <!--@mbg.generated--> - insert into se_client_card (id, cardAddr, cardNum, clientId, + insert into se_client_card (id, protocol, cardAddr, cardNum, clientId, money, `state`, original_card_id, createDt, replaceDt, rechargeDt, lossDtDt, cancelDt, unlockDt, reversalDt, refundDt, consumeDt, lastOper, remarks ) - values (#{id,jdbcType=BIGINT}, #{cardaddr,jdbcType=VARCHAR}, #{cardnum,jdbcType=BIGINT}, #{clientid,jdbcType=BIGINT}, + values (#{id,jdbcType=BIGINT}, #{protocol,jdbcType=VARCHAR}, #{cardaddr,jdbcType=VARCHAR}, #{cardnum,jdbcType=BIGINT}, #{clientid,jdbcType=BIGINT}, #{money,jdbcType=FLOAT}, #{state,jdbcType=TINYINT}, #{originalCardId,jdbcType=BIGINT}, #{createdt,jdbcType=TIMESTAMP}, #{replacedt,jdbcType=TIMESTAMP}, #{rechargedt,jdbcType=TIMESTAMP}, #{lossdtdt,jdbcType=TIMESTAMP}, #{canceldt,jdbcType=TIMESTAMP}, #{unlockdt,jdbcType=TIMESTAMP}, #{reversaldt,jdbcType=TIMESTAMP}, @@ -102,6 +103,9 @@ <!--@mbg.generated--> insert into se_client_card <trim prefix="(" suffix=")" suffixOverrides=","> + <if test="protocol != null"> + protocol, + </if> <if test="cardaddr != null"> cardAddr, </if> @@ -155,6 +159,9 @@ </if> </trim> <trim prefix="values (" suffix=")" suffixOverrides=","> + <if test="protocol != null"> + #{protocol,jdbcType=VARCHAR}, + </if> <if test="cardaddr != null"> #{cardaddr,jdbcType=VARCHAR}, </if> @@ -212,6 +219,9 @@ <!--@mbg.generated--> update se_client_card <set> + <if test="protocol != null"> + protocol = #{protocol,jdbcType=VARCHAR}, + </if> <if test="cardaddr != null"> cardAddr = #{cardaddr,jdbcType=VARCHAR}, </if> @@ -269,7 +279,8 @@ <update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoSe.SeClientCard"> <!--@mbg.generated--> update se_client_card - set cardAddr = #{cardaddr,jdbcType=VARCHAR}, + set protocol = #{protocol,jdbcType=VARCHAR} + cardAddr = #{cardaddr,jdbcType=VARCHAR}, cardNum = #{cardnum,jdbcType=BIGINT}, clientId = #{clientid,jdbcType=BIGINT}, money = #{money,jdbcType=FLOAT}, diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/virtualCard/VirtualCardSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/virtualCard/VirtualCardSv.java deleted file mode 100644 index 1b25e36..0000000 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/virtualCard/VirtualCardSv.java +++ /dev/null @@ -1,355 +0,0 @@ -package com.dy.pipIrrWechat.virtualCard; - -import com.dy.common.webUtil.BaseResponse; -import com.dy.common.webUtil.BaseResponseUtils; -import com.dy.common.webUtil.QueryResultVo; -import com.dy.pipIrrGlobal.daoSe.*; -import com.dy.pipIrrGlobal.pojoSe.SeVcRecharge; -import com.dy.pipIrrGlobal.pojoSe.SeVcRefund; -import com.dy.pipIrrGlobal.pojoSe.SeVcRefundItem; -import com.dy.pipIrrGlobal.pojoSe.SeVirtualCard; -import com.dy.pipIrrGlobal.voSe.VoOrders; -import com.dy.pipIrrGlobal.voSe.VoVcRecharge; -import com.dy.pipIrrGlobal.voSe.VoVirtualCard; - -import com.dy.pipIrrSell.result.SellResultCode; -import com.dy.pipIrrSell.virtualCard.dto.DtoVcRecharge; -import com.dy.pipIrrSell.virtualCard.dto.DtoVirtualCard; -import com.dy.pipIrrSell.virtualCard.enums.LastOperateENUM; -import com.dy.pipIrrSell.virtualCard.enums.OrderStateENUM; - -import lombok.extern.slf4j.Slf4j; -import org.apache.dubbo.common.utils.PojoUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Date; -import java.util.List; -import java.util.Map; - -/** - * @author ZhuBaoMin - * @date 2024-07-11 15:49 - * @LastEditTime 2024-07-11 15:49 - * @Description - */ - -@Slf4j -@Service -public class VirtualCardSv { - @Autowired - private SeVirtualCardMapper seVirtualCardMapper; - - @Autowired - private SeVcRechargeMapper seVcRechargeMapper; - - @Autowired - private SeVcRefundMapper seVcRefundMapper; - - @Autowired - private SeVcRefundItemMapper seVcRefundItemMapper; - - @Autowired - private SeClientMapper seClientMapper; - - /** - * 鏍规嵁鍐滄埛ID鑾峰彇5绾ц鏀垮尯鍒掍唬鐮侊紝娉ㄥ唽铏氭嫙鍗′娇鐢� - * @param clientId 鍐滄埛ID - * @return 5绾ц鏀垮尯鍒掍唬鐮� - */ - public Long getAreaCodeById(Long clientId) { - return seClientMapper.getAreaCodeById(clientId); - } - - /** - * 鑾峰彇鍐滄埛鍏ㄩ儴铏氭嫙鍗� - * @return - */ - public List<VoVirtualCard> getVCs(Long clientId) { - return seVirtualCardMapper.getVCs(clientId); - } - - /** - * 鏍规嵁铏氭嫙鍗D鑾峰彇铏氭嫙鍗″璞� - * @param vcId - * @return - */ - public VoVirtualCard getVcById(Long vcId) { - return seVirtualCardMapper.getVcById(vcId); - } - - /** - * 娉ㄥ唽铏氭嫙鍗� - * @param po - * @return - */ - public Long insertVirtualCard(SeVirtualCard po) { - seVirtualCardMapper.insert(po); - return po.getId(); - } - - /** - * 鏍规嵁琛屾斂鍖哄垝涓叉ā绯婃煡璇㈣櫄鎷熷崱缂栧彿锛屾敞鍐岃櫄鎷熷崱浣跨敤 - * @param areaCode - * @return - */ - String getVcCardNumOfMax(String areaCode) { - return seVirtualCardMapper.getVcCardNumOfMax(areaCode); - } - - /** 搴熷純 - * 楠岃瘉鍐滄埛鏄惁鎷ユ湁鎸囧畾鍚嶇О鐨勮櫄鎷熷崱 - * @param po - * @return - */ - //public Integer getRecordCountByName(DtoRegist po) { - // return seVirtualCardMapper.getRecordCountByName(po.getClientId(), po.getVcName()); - //} - - /** - * 淇敼铏氭嫙鍗� - * 鍏呭�笺�佹秷璐广�佺敵璇烽��娆俱�佸鏍搁��娆炬椂闇�瑕佷慨鏀硅櫄鎷熷崱鐨勶細浣欓銆佹渶鍚庢搷浣溿�佹渶鍚庢搷浣滄椂闂� - * @param po - * @return - */ - public Integer updateVirtualCard(SeVirtualCard po) { - return seVirtualCardMapper.updateByPrimaryKeySelective(po); - } - - /** - * 鏍规嵁铏氭嫙鍗$紪鍙疯幏鍙栬櫄鎷熷崱瀵硅薄 - * @param virtualId - * @return - */ - public SeVirtualCard selectVirtuCardById(Long virtualId) { - return seVirtualCardMapper.selectByPrimaryKey(virtualId); - } - - /** - * 娣诲姞铏氭嫙鍗″厖鍊艰褰� - * JSAPI涓嬪崟鍚庣敓鎴愰儴鍒嗗厖鍊艰褰� - * @param po - * @return - */ - public BaseResponse<Boolean> insertVCRecharge(DtoVirtualCard po) { - String orderNumber = po.getOrderNumber(); - Long virtualId = po.getVirtualId(); - Long clientId = po.getClientId(); - Integer rechargeAmount = po.getRechargeAmount(); - - // 楠岃瘉璇ヨ櫄鎷熷崱璐︽埛鏄惁瀛樺湪骞跺彇鍑哄綋鍓嶈处鎴蜂綑棰� - SeVirtualCard seVirtualCard = seVirtualCardMapper.selectByPrimaryKey(virtualId); - if(seVirtualCard == null) { - return BaseResponseUtils.buildFail(SellResultCode.NO_ACCOUNT.getMessage()); - } - Double money = seVirtualCard.getMoney(); - - // 娣诲姞鍏呭�艰褰� - SeVcRecharge seVcRecharge = new SeVcRecharge(); - seVcRecharge.setVcId(virtualId); - seVcRecharge.setClientId(clientId); - seVcRecharge.setMoney(money); - seVcRecharge.setOrderNumber(orderNumber); - seVcRecharge.setRechargeAmount(rechargeAmount); - seVcRecharge.setOrderTime(new Date()); - seVcRecharge.setOrderState(OrderStateENUM.NON_PAYMENT.getCode()); - Integer rec = seVcRechargeMapper.insert(seVcRecharge); - if(rec == null) { - return BaseResponseUtils.buildFail(SellResultCode.RECHARGE_FAIL.getMessage()); - } - return BaseResponseUtils.buildSuccess(true) ; - } - - /** - * 鏍规嵁璁㈠崟鍙疯幏鍙栬櫄鎷熷崱鍏呭�煎璞� - * @param orderNumber - * @return - */ - public SeVcRecharge getVCRechargeByorderNumber(String orderNumber) { - return seVcRechargeMapper.getVCRechargeByorderNumber(orderNumber); - } - - /** - * 淇敼铏氭嫙鍗″厖鍊艰褰� - * 寰俊鏀粯閫氱煡鍚庯細 - * 1. 鏇存柊鍏呭�艰〃锛氬厖鍊煎悗浣欓銆佹敮浠樺畬鎴愭椂闂淬�佽鍗曠姸鎬� - * 2. 鏇存柊铏氭嫙鍗¤〃锛氳处鎴蜂綑棰濄�佹渶鍚庢搷浣溿�佹渶鍚庢搷浣滄椂闂� - * @param orderNumber 璁㈠崟缂栧彿 - * @return - */ - @Transactional(rollbackFor = Exception.class) - public BaseResponse<Boolean> updateVCRecharge(String orderNumber, Date rechargeTime) { - SeVcRecharge seVcRecharge = seVcRechargeMapper.getVCRechargeByorderNumber(orderNumber); - if(seVcRecharge == null) { - return BaseResponseUtils.buildFail(SellResultCode.RECHARGE_NOT_EXIST.getMessage()); - } - - Long virtualId = seVcRecharge.getVcId(); - Double money = seVcRecharge.getMoney(); - Integer rechargeAmount = seVcRecharge.getRechargeAmount(); - Double afterRrecharge = money + rechargeAmount; - - seVcRecharge.setAfterRecharge(afterRrecharge); - seVcRecharge.setRechargeTime(rechargeTime); - seVcRecharge.setOrderState(OrderStateENUM.PAID.getCode()); - Integer rec = seVcRechargeMapper.updateByPrimaryKeySelective(seVcRecharge); - if(rec == null) { - return BaseResponseUtils.buildFail(SellResultCode.RECHARGE_FAIL.getMessage()); - } - - SeVirtualCard seVirtualCard = seVirtualCardMapper.selectByPrimaryKey(virtualId); - if(seVirtualCard == null) { - return BaseResponseUtils.buildFail(SellResultCode.VIRTUAL_CARD_NOT_EXIST.getMessage()); - } - seVirtualCard.setMoney(afterRrecharge); - seVirtualCard.setLastOperate(LastOperateENUM.RECHARGE.getCode()); - seVirtualCard.setLastOperateTime(new Date()); - Integer rec2 = seVirtualCardMapper.updateByPrimaryKeySelective(seVirtualCard); - if(rec2 == null) { - return BaseResponseUtils.buildFail(SellResultCode.RECHARGE_FAIL.getMessage()); - } - return BaseResponseUtils.buildSuccess(true) ; - } - - /** - * 淇敼铏氭嫙鍗″厖鍊艰褰曪紙搴熷純锛� - * 寰俊灏忕▼搴忔敮浠橀�氱煡鍚庝慨鏀癸細浣欓銆佸厖鍊煎悗浣欓銆佸厖鍊煎畬鎴愭椂闂� - * @param po - * @return - */ - public Integer updateVCRecharge(SeVcRecharge po) { - return seVcRechargeMapper.updateByPrimaryKeySelective(po); - } - - /** - * 鏍规嵁铏氭嫙鍗″彿鑾峰彇璁㈠崟鍒楄〃 - * @param virtualId - * @return - */ - public List<VoOrders> selectOrders(Long virtualId) { - List<VoOrders> rsVo = seVcRechargeMapper.getOrders(virtualId); - return rsVo ; - } - - /** - * 鏍规嵁閫�娆綢D鑾峰彇閫�娆惧璞� - * @param refundId - * @return - */ - public SeVcRefund selectRefundByRefundId(Long refundId) { - return seVcRefundMapper.selectByPrimaryKey(refundId); - } - - /** - * 娣诲姞閫�娆剧敵璇� - * @param po - * @return - */ - public Long addRefund(SeVcRefund po) { - seVcRefundMapper.insert(po); - return po.getId(); - } - - /** - * 淇敼閫�娆捐褰� - * @param po - * @return - */ - public Integer updateRefund(SeVcRefund po) { - return seVcRefundMapper.updateByPrimaryKeySelective(po); - } - - /** - * 鏍规嵁璁㈠崟鍙疯幏鍙栧叾鍚勭瑪閫�娆鹃噾棰� - * @param orderNumber - * @return - */ - public List<Integer> selectRefundAmount(String orderNumber) { - List<Integer> rsVo = seVcRefundMapper.getRefundAmount(orderNumber); - return rsVo; - } - - /** - * 娣诲姞閫�娆惧垎椤� - * @param po - * @return - */ - public Long addRefundItem(SeVcRefundItem po) { - seVcRefundItemMapper.insert(po); - return po.getRefundId(); - } - - /** - * 缂栬緫閫�娆惧垎椤� - * @param po - * @return - */ - public Integer updateRefundItem(SeVcRefundItem po) { - return seVcRefundItemMapper.updateByPrimaryKeySelective(po); - } - - /** - * 鏍规嵁璁㈠崟鍙风敓鎴愰��娆惧崟鍙� - * @param orderNumber - * @return - */ - public String generateRefundNumber(String orderNumber) { - String refundNumber = seVcRefundItemMapper.getLastRefundNumber(orderNumber); - if(refundNumber == null) { - refundNumber = orderNumber + "01"; - return refundNumber; - } - - String a = String.format("%02d", (Integer.parseInt(refundNumber.substring(29,30).trim()) + 1)); - return a; - } - - /** - * 鏍规嵁璁㈠崟鍙疯幏鍙栧厖鍊奸噾棰濓紝璋冪敤閫�娆剧敵璇锋帴鍙d娇鐢� - * @param orderNumber - * @return - */ - public Integer getRechargeAmountByOrderNumber(String orderNumber) { - return seVcRechargeMapper.getRechargeAmountByOrderNumber(orderNumber); - - } - - /** - * 鏍规嵁閫�娆鹃�氱煡鎺ュ彛杩斿洖鐨勯��娆惧崟鍙峰弽鏌ラ��娆綢D锛屾煡璇㈣閫�娆綢D涓嬫湭閫�娆捐褰曟暟閲� - * @param refundNumber - * @return - */ - public Integer getNoRefundedCount(String refundNumber) { - return seVcRefundItemMapper.getNoRefundedCount(refundNumber); - } - - /** - * 鏍规嵁閫�娆惧崟鍙疯幏鍙栭��娆綢D锛岄��娆鹃�氱煡鍚庢洿鏂伴��娆捐〃鎵�闇� - * @param refundNumber - * @return - */ - public Long getRefundIdByRefundNumber(String refundNumber) { - return seVcRefundItemMapper.getRefundIdByRefundNumber(refundNumber); - } - - /** - * 鑾峰彇铏氭嫙鍗″厖鍊艰褰� - * @param dtoVcRecharge - * @return - */ - public QueryResultVo<List<VoVcRecharge>> getVcRechargeRecords(DtoVcRecharge dtoVcRecharge){ - Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(dtoVcRecharge); - Long itemTotal = seVirtualCardMapper.getRechargeRecordCount(params); - - QueryResultVo<List<VoVcRecharge>> rsVo = new QueryResultVo<>(); - rsVo.pageSize = dtoVcRecharge.pageSize; - rsVo.pageCurr = dtoVcRecharge.pageCurr; - - rsVo.calculateAndSet(itemTotal, params); - rsVo.obj = seVirtualCardMapper.getVcRechargeRecords(params); - - return rsVo; - } -} - -- Gitblit v1.8.0