From 1473f665730d9adc30011691e7a1ec04ce134709 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期六, 14 九月 2024 08:35:52 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/clientCard/LastOperateENUM.java | 6
pipIrr-platform/pipIrr-global/src/main/resources/application-database-pj.yml | 1
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoTradeDetails.java | 8 +
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml | 33 +++++++
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateSv.java | 33 ++++----
pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml | 60 ++++++++++++--
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateCtrl.java | 34 ++++----
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoClient.java | 17 ++++
pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml | 2
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/enums/OperateTypeENUM.java | 6
pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml | 1
11 files changed, 146 insertions(+), 55 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoTradeDetails.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoTradeDetails.java
index 2638fb8..d65d5c7 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoTradeDetails.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoTradeDetails.java
@@ -22,7 +22,7 @@
*/
@Data
-@JsonPropertyOrder({"orderNumber", "clientName", "cardNum", "idCard", "clientNum", "phone", "operateType", "tradeAmount", "waterCost", "cardCost", "gift", "refundAmount", "money", "paymentName", "tradeTime", "cashierId", "cardState", "districtTitle", "villageId"})
+@JsonPropertyOrder({"orderNumber", "clientName", "cardNum", "idCard", "clientNum", "phone", "operateType", "tradeAmount", "waterCost", "cardCost", "gift", "refundAmount", "money", "paymentName", "tradeTime", "cashierId", "cashierName", "cardState", "districtTitle", "villageId"})
@HeadRowHeight(30)
@ContentRowHeight(20)
public class VoTradeDetails implements BaseEntity {
@@ -140,6 +140,12 @@
private Long cashierId;
/**
+ * 鏀堕摱鍛樺鍚�
+ */
+ @ColumnWidth(15)
+ private String cashierName;
+
+ /**
* 鍗＄墖鐘舵��
*/
@ColumnWidth(15)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoClient.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoClient.java
index 81700c2..f4968aa 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoClient.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoClient.java
@@ -50,4 +50,21 @@
* 寮�闃�娆℃暟
*/
private Integer openCount;
+
+ /**
+ * 鐢ㄦ按閲�
+ */
+ private Double waterConsumption;
+
+ /**
+ * 娑堣垂閲戦
+ */
+ private Double amountSpent;
+
+ /**
+ * 鐢ㄦ按鏃堕暱
+ */
+ private Double waterDuration;
+
+
}
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/application-database-pj.yml b/pipIrr-platform/pipIrr-global/src/main/resources/application-database-pj.yml
index 4b385ce..7eb4d18 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/application-database-pj.yml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/application-database-pj.yml
@@ -7,7 +7,6 @@
driverClassName: com.mysql.cj.jdbc.Driver
# url: jdbc:mysql://192.168.40.166:3306/pipIrr_pj?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
# url: jdbc:mysql://8.130.130.233:3306/pipIrr_pj?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
- #url: jdbc:mysql://8.140.179.55:3306/pipIrr_pj?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
url: jdbc:mysql://127.0.0.1:3306/pipIrr_pj?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/application-global.yml b/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
index 618597e..54ca603 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
@@ -71,7 +71,7 @@
pipIrr:
global:
- dev: false #鏄惁寮�鍙戦樁娈碉紝true鎴杅alse
+ dev: false #鏄惁寮�鍙戦樁娈碉紝true鎴杅alse
dsName: ym #寮�鍙戦樁娈碉紝璁剧疆涓存椂鐨勬暟鎹簱鍚嶇О
mw:
webPort: 8070
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml b/pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml
index 8e726f1..b28eb79 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml
@@ -24,7 +24,6 @@
<item2 name="寰俊鏀粯"/>
<item3 name="鏀粯瀹濇敮浠�"/>
<item4 name="閾惰杞处"/>
- <item5 name="鎹㈠崱"/>
</payments>
<settings>
<item1 item_name="lng" item_value="101.87345" remarks="缁忓害"/>
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml
index bff8b95..cb816f9 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml
@@ -748,7 +748,16 @@
cli.clientNum,
CONCAT(cli.districtTitle, cli.address) AS address,
cli.phone,
- cli.idCard
+ cli.idCard,
+ IFNULL((SELECT SUM(his.cl_this_amount)
+ FROM rm_open_close_valve_history his
+ <where>
+ his.client_id = cli.id
+ <if test="timeStart != null and timeStart != '' and timeStop != null and timeStop != ''">
+ AND his.op_dt BETWEEN #{timeStart} AND #{timeStop}
+ </if>
+ </where>
+ ),0) AS waterConsumption
FROM se_client cli
<where>
<if test="timeStart != null and timeStart != '' and timeStop != null and timeStop != '' and waterConsumption != null">
@@ -786,7 +795,16 @@
cli.clientNum,
CONCAT(cli.districtTitle, cli.address) AS address,
cli.phone,
- cli.idCard
+ cli.idCard,
+ IFNULL((SELECT SUM(his.cl_this_money)
+ FROM rm_open_close_valve_history his
+ <where>
+ his.client_id = cli.id
+ <if test="timeStart != null and timeStart != '' and timeStop != null and timeStop != ''">
+ AND his.op_dt BETWEEN #{timeStart} AND #{timeStop}
+ </if>
+ </where>
+ ),0) AS amountSpent
FROM se_client cli
<where>
<if test="timeStart != null and timeStart != '' and timeStop != null and timeStop != '' and amountSpent != null">
@@ -825,7 +843,16 @@
cli.clientNum,
CONCAT(cli.districtTitle, cli.address) AS address,
cli.phone,
- cli.idCard
+ cli.idCard,
+ IFNULL((SELECT SUM(his.cl_this_time)
+ FROM rm_open_close_valve_history his
+ <where>
+ his.client_id = cli.id
+ <if test="timeStart != null and timeStart != '' and timeStop != null and timeStop != ''">
+ AND his.op_dt BETWEEN #{timeStart} AND #{timeStop}
+ </if>
+ </where>
+ ),0) AS waterDuration
FROM se_client cli
<where>
<if test="timeStart != null and timeStart != '' and timeStop != null and timeStop != '' and waterDuration != null">
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml
index d413173..0d22785 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml
@@ -331,39 +331,81 @@
<select id="getTransactionRecordCount" parameterType="java.util.Map" resultType="java.lang.Long">
SELECT
COUNT(*) AS recordCount
- FROM v_trade_details
+ FROM se_card_operate ope
+ INNER JOIN se_client cli ON ope.client_id = cli.id
+ INNER JOIN se_client_card card ON card.id = ope.card_id
+ LEFT JOIN se_payment_method pay ON ope.payment_id = pay.id
+ INNER JOIN ba_user us ON ope.operator = us.id
<where>
+ AND ope.operate_type IN(1,2,3,5)
+
<if test = "villageId != null and villageId > 0">
- AND villageId = #{villageId}
+ AND cli.villageId = #{villageId}
</if>
<if test = "operateTimeStart != null and operateTimeStop != null">
- AND tradeTime BETWEEN #{operateTimeStart} AND #{operateTimeStop}
+ AND ope.operate_dt BETWEEN #{operateTimeStart} AND #{operateTimeStop}
</if>
<if test = "cashierId != null and cashierId > 0">
- AND cashierId = #{cashierId}
+ AND us.id = #{cashierId}
</if>
</where>
</select>
<!--鏍规嵁鎸囧畾鏉′欢鑾峰彇浜ゆ槗璁板綍-->
<select id="getTransactions" resultType="com.dy.pipIrrGlobal.voSe.VoTradeDetails">
- SELECT * FROM v_trade_details
+ SELECT
+ ope.id AS orderNumber,
+ cli.name AS clientName,
+ card.cardNum AS cardNum,
+ cli.idCard,
+ cli.clientNum,
+ cli.phone,
+ (CASE ope.operate_type
+ WHEN 1 THEN '寮�鍗�'
+ WHEN 2 THEN '鍏呭��'
+ WHEN 3 THEN '閿�鍗�'
+ WHEN 5 THEN '琛ユ墸'
+ END) AS operateType,
+ (IFNULL(ope.trade_amount,0.00) + IFNULL(ope.card_cost,0.00)) AS tradeAmount,
+ IFNULL(ope.trade_amount,0.00) AS waterCost,
+ IFNULL(ope.card_cost,0.00) AS cardCost,
+ IFNULL(ope.gift,0.00) AS gift,
+ IFNULL(ope.refund_amount,0.00) AS refundAmount,
+ ope.money,
+ pay.name AS paymentName,
+ ope.operate_dt as tradeTime,
+ us.id AS cashierId,
+ us.name AS cashierName,
+ (CASE card.state
+ WHEN 1 THEN '姝ｅ父'
+ WHEN 2 THEN '宸叉敞閿�'
+ WHEN 3 THEN '宸叉寕澶�'
+ END) AS cardState,
+ cli.districtTitle,
+ cli.villageId AS villageId
+ FROM se_card_operate ope
+ INNER JOIN se_client cli ON ope.client_id = cli.id
+ INNER JOIN se_client_card card ON card.id = ope.card_id
+ LEFT JOIN se_payment_method pay ON ope.payment_id = pay.id
+ INNER JOIN ba_user us ON ope.operator = us.id
<where>
+ AND ope.operate_type IN(1,2,3,5)
+
<if test = "villageId != null and villageId > 0">
- AND villageId = #{villageId}
+ AND cli.villageId = #{villageId}
</if>
<if test = "operateTimeStart != null and operateTimeStop != null">
- AND tradeTime BETWEEN #{operateTimeStart} AND #{operateTimeStop}
+ AND ope.operate_dt BETWEEN #{operateTimeStart} AND #{operateTimeStop}
</if>
<if test = "cashierId != null and cashierId > 0">
- AND cashierId = #{cashierId}
+ AND us.id = #{cashierId}
</if>
</where>
- ORDER BY tradeTime
+ ORDER BY ope.operate_dt
<trim prefix="limit ">
<if test="start != null and count != null">
#{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateCtrl.java
index 4eb7374..c3638e5 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateCtrl.java
@@ -63,7 +63,6 @@
private Integer projectNo;
/**
* 寮�鍗�
- * 褰撳崱鐗囪垂鐢ㄤ负0鏃跺嵆涓烘崲鍗℃搷浣滐紝涓嶆敹鍗＄墖璐圭敤锛屼笉鏀朵綑棰�
* @param po 寮�鍗′紶鍏ュ璞�
* @param bindingResult
* @return 姘村崱缂栧彿
@@ -143,21 +142,21 @@
seClientCard.setOriginalCardId(originalCardId);
}
seClientCard.setCreatedt(activeTime);
- if(cardCost == 0) {
- // 鎹㈠崱
- seClientCard.setLastoper(LastOperateENUM.CHANGE_CARD.getCode());
- }else {
- // 寮�鍗�
- seClientCard.setLastoper(LastOperateENUM.ACTIVE.getCode());
- }
- //seClientCard.setLastoper(LastOperateENUM.ACTIVE.getCode());
+ //if(cardCost == 0) {
+ // // 鎹㈠崱
+ // seClientCard.setLastoper(LastOperateENUM.CHANGE_CARD.getCode());
+ //}else {
+ // // 寮�鍗�
+ // seClientCard.setLastoper(LastOperateENUM.ACTIVE.getCode());
+ //}
+ seClientCard.setLastoper(LastOperateENUM.ACTIVE.getCode());
Long cardId = Optional.ofNullable(clientCardSv.add(seClientCard)).orElse(0L) ;
if(cardId == 0) {
return BaseResponseUtils.buildErrorMsg(SellResultCode.ACTIVE_FAIL_WRITE_CLIENT_CARD_ERROR.getMessage());
}
/**
- * 娣诲姞寮�鍗¤褰曪紝閫�杩橀噾棰濅綔涓哄厖鍊奸噾棰�
+ * 娣诲姞寮�鍗℃搷浣滆褰曪紝閫�杩橀噾棰濅綔涓哄厖鍊奸噾棰�
*/
SeCardOperate seCardOperate = new SeCardOperate();
seCardOperate.setCardId(cardId);
@@ -170,11 +169,12 @@
seCardOperate.setOperateType(OperateTypeENUM.REISSUE.getCode());
}else {
// 寮�鏂板崱鎴栨崲鍗�
- if(cardCost > 0) {
- seCardOperate.setOperateType(OperateTypeENUM.ACTIVE.getCode());
- }else {
- seCardOperate.setOperateType(OperateTypeENUM.CHANGE_CARD.getCode());
- }
+ //if(cardCost > 0) {
+ // seCardOperate.setOperateType(OperateTypeENUM.ACTIVE.getCode());
+ //}else {
+ // seCardOperate.setOperateType(OperateTypeENUM.CHANGE_CARD.getCode());
+ //}
+ seCardOperate.setOperateType(OperateTypeENUM.ACTIVE.getCode());
}
seCardOperate.setRemarks(remarks);
seCardOperate.setOperator(operator);
@@ -400,7 +400,7 @@
}
/**
- * 娣诲姞娉ㄩ攢璁板綍
+ * 娣诲姞娉ㄩ攢鎿嶄綔璁板綍
* 鏀粯鏂瑰紡涓虹幇閲�
*/
SeCardOperate seCardOperate = new SeCardOperate();
@@ -672,7 +672,7 @@
}
/**
- * 娣诲姞琛ユ墸璁板綍
+ * 娣诲姞琛ユ墸鎿嶄綔璁板綍
*/
SeCardOperate seCardOperate = new SeCardOperate();
seCardOperate.setCardId(cardId);
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateSv.java
index e1b1c04..86bd4d3 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateSv.java
@@ -208,18 +208,19 @@
seClientCard.setId(cardId);
seClientCard.setMoney(afterRecharge);
seClientCard.setRechargedt(rechargeTime);
- if(paymentName != null && paymentName.equals("鎹㈠崱")) {
- seClientCard.setLastoper(LastOperateENUM.CHANGE_RECHARGE.getCode ());
- }else {
- seClientCard.setLastoper(LastOperateENUM.RECHARGE.getCode ());
- }
+ //if(paymentName != null && paymentName.equals("鎹㈠崱")) {
+ // seClientCard.setLastoper(LastOperateENUM.CHANGE_RECHARGE.getCode ());
+ //}else {
+ // seClientCard.setLastoper(LastOperateENUM.RECHARGE.getCode ());
+ //}
+ seClientCard.setLastoper(LastOperateENUM.RECHARGE.getCode ());
Integer rec_updateClientCard = Optional.ofNullable(clientCardSv.UpdateClientCard(seClientCard)).orElse(0);
if(rec_updateClientCard == 0) {
return BaseResponseUtils.buildErrorMsg(SellResultCode.RECHARGE_FAIL_WRITE_CLIENT_CARD_ERROR.getMessage());
}
/**
- * 娣诲姞姘村崱鎿嶄綔璁板綍
+ * 娣诲姞姘村崱鍏呭�兼搷浣滆褰�
*/
SeCardOperate seCardOperate = new SeCardOperate();
seCardOperate.setCardId(cardId);
@@ -227,11 +228,12 @@
seCardOperate.setMoney(money);
seCardOperate.setTradeAmount(amount);
seCardOperate.setGift(gift);
- if(paymentName != null && paymentName.equals("鎹㈠崱")) {
- seCardOperate.setOperateType(OperateTypeENUM.CHANGE_RECHARGE.getCode());
- }else {
- seCardOperate.setOperateType(OperateTypeENUM.RECHARGE.getCode());
- }
+ //if(paymentName != null && paymentName.equals("鎹㈠崱")) {
+ // seCardOperate.setOperateType(OperateTypeENUM.CHANGE_RECHARGE.getCode());
+ //}else {
+ // seCardOperate.setOperateType(OperateTypeENUM.RECHARGE.getCode());
+ //}
+ seCardOperate.setOperateType(OperateTypeENUM.RECHARGE.getCode());
seCardOperate.setPaymentId(paymentId);
seCardOperate.setPrice(price);
seCardOperate.setRemarks(remarks);
@@ -328,12 +330,13 @@
// 鑾峰彇绗﹀悎鏉′欢鐨勮褰曟暟
Long itemTotal = Optional.ofNullable(seCardOperateMapper.getTransactionRecordCount(params)).orElse(0L);
- QueryResultVo rsVo = new QueryResultVo<>() ;
+ QueryResultVo<List<VoTradeDetails>> rsVo = new QueryResultVo<>() ;
rsVo.pageSize = vo.pageSize ;
rsVo.pageCurr = vo.pageCurr ;
rsVo.calculateAndSet(itemTotal, params);
- List<VoTradeDetails> list = seCardOperateMapper.getTransactions(params);
+ rsVo.obj = seCardOperateMapper.getTransactions(params);
+ List<VoTradeDetails> list = rsVo.obj;
if(list.size() == 0) {
return new HashMap();
}
@@ -359,15 +362,13 @@
}
Map map_record = new HashMap();
- map_record.put("itemTotal", itemTotal);
- map_record.put("list", list);
+ map_record.put("list", rsVo);
Map map_result = new HashMap();
map_result.put("waterCost", df.format(totalWaterCost));
map_result.put("cardCost", df.format(totalCardCost));
map_result.put("gift", df.format(totalGift));
map_result.put("refund", df.format(totalRefund));
-
map_result.put("records", map_record);
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/enums/OperateTypeENUM.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/enums/OperateTypeENUM.java
index 7d5eb01..722dfdf 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/enums/OperateTypeENUM.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/enums/OperateTypeENUM.java
@@ -21,9 +21,9 @@
LOSS((byte)6, "鎸傚け"),
REVERSAL((byte)7, "鍐叉"),
UNLOCK((byte)8, "瑙ｉ攣"),
- CONSUME((byte)9, "娑堣垂"),
- CHANGE_CARD((byte)10, "鎹㈠崱"),
- CHANGE_RECHARGE((byte)11, "鎹㈠崱鍏呭��");
+ CONSUME((byte)9, "娑堣垂");
+ //CHANGE_CARD((byte)10, "鎹㈠崱"),
+ //CHANGE_RECHARGE((byte)11, "鎹㈠崱鍏呭��");
private final Byte code;
private final String message;
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/clientCard/LastOperateENUM.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/clientCard/LastOperateENUM.java
index 0f0ee95..29b1e18 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/clientCard/LastOperateENUM.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/clientCard/LastOperateENUM.java
@@ -21,9 +21,9 @@
LOSS((byte)6, "鎸傚け"),
REVERSAL((byte)7, "鍐叉"),
UNLOCK((byte)8, "瑙ｉ攣"),
- CONSUME((byte)9, "娑堣垂"),
- CHANGE_CARD((byte)10,"鎹㈠崱"),
- CHANGE_RECHARGE((byte)11,"鎹㈠崱鍏呭��");
+ CONSUME((byte)9, "娑堣垂");
+ //CHANGE_CARD((byte)10,"鎹㈠崱"),
+ //CHANGE_RECHARGE((byte)11,"鎹㈠崱鍏呭��");
private final Byte code;
private final String message;
--
Gitblit v1.8.0