tplus-member 3.26.12 → 3.26.16

package/dist/member/memberMenuStorage/index.js

@@ -493,9 +493,10 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
             var _ref9 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4() {
                 var cardInfo = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
                 var storageAmount = arguments[1];
-                var isCash = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+                var lastesStorage = arguments[2];
+                var isCash = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
 
-                var store, _store$data, data, MeStorageCardId, StorageCardNo, ID, _cardInfo$LatestStora, latestStorageAmount, paymentTypeId, finAccountId, _props9, getCardList, _props9$cardList, cardList, params, ret;
+                var store, _store$data, data, MeStorageCardId, StorageCardNo, ID, _cardInfo$PresentAmou, PresentAmount, _props9, getCardList, _props9$cardList, cardList, _ref10, paymentTypeId, finAccountId, params, ret;
 
                 return _regenerator2.default.wrap(function _callee4$(_context4) {
                     while (1) {
@@ -511,79 +512,76 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
                             case 2:
                                 store = _mutantsMicrofx.stores.memberStore;
                                 _store$data = store.data, data = _store$data === undefined ? {} : _store$data;
-                                MeStorageCardId = cardInfo.MeStorageCardId, StorageCardNo = cardInfo.StorageCardNo, ID = cardInfo.ID, _cardInfo$LatestStora = cardInfo.LatestStorageInfo;
-                                _cardInfo$LatestStora = _cardInfo$LatestStora === undefined ? {} : _cardInfo$LatestStora;
-                                latestStorageAmount = _cardInfo$LatestStora.latestStorageAmount, paymentTypeId = _cardInfo$LatestStora.paymentTypeId, finAccountId = _cardInfo$LatestStora.finAccountId;
+                                MeStorageCardId = cardInfo.MeStorageCardId, StorageCardNo = cardInfo.StorageCardNo, ID = cardInfo.ID, _cardInfo$PresentAmou = cardInfo.PresentAmount, PresentAmount = _cardInfo$PresentAmou === undefined ? 0 : _cardInfo$PresentAmou;
                                 _props9 = this.props, getCardList = _props9.getCardList, _props9$cardList = _props9.cardList, cardList = _props9$cardList === undefined ? [] : _props9$cardList;
+                                _ref10 = lastesStorage || {}, paymentTypeId = _ref10.paymentTypeId, finAccountId = _ref10.finAccountId;
                                 params = (0, _extends3.default)({}, data, {
                                     StorageDetails: [{
                                         Idmember: ID,
                                         ThisStorageAmount: storageAmount,
                                         StorageType: {},
                                         meStorageCardId: MeStorageCardId,
-                                        isPresentGiftpack: false
+                                        isPresentGiftpack: data.StorageDetails[0].isPresentGiftpack,
+                                        ThisPresentAmount: (0, _utils.getFixedNumber)(0 - PresentAmount)
                                     }],
                                     redBlueFlagEnum: 'RED',
                                     storageAmount: storageAmount,
                                     tradeTypeEnum: 'REFUND_CARD',
-                                    StorageMutiSettleDetails: []
-                                    // if (isCash) {
+                                    StorageMutiSettleDetails: [{
+                                        "StorageAmount": storageAmount,
+                                        "PaymentCode": "",
+                                        "DynamicPropertyValues": [],
+                                        "IdbankAccount": finAccountId,
+                                        "Code": 1,
+                                        "IdsettleStyle": paymentTypeId,
+                                        "DynamicPropertyKeys": [],
+                                        "DataSource": {}
+                                    }]
                                 });
-                                params.StorageMutiSettleDetails = [{
-                                    "StorageAmount": storageAmount,
-                                    "PaymentCode": "",
-                                    "DynamicPropertyValues": [],
-                                    "IdbankAccount": finAccountId,
-                                    "Code": 1,
-                                    "IdsettleStyle": paymentTypeId,
-                                    "DynamicPropertyKeys": [],
-                                    "DataSource": {}
-                                }];
-                                // }
-                                _context4.next = 12;
+                                _context4.next = 10;
                                 return this.setState({
                                     refundBtnDisabled: true
                                 });
 
-                            case 12:
-                                _context4.prev = 12;
-                                _context4.next = 15;
+                            case 10:
+                                _context4.prev = 10;
+                                _context4.next = 13;
                                 return this.api.ReturnedStorage(params);
 
-                            case 15:
+                            case 13:
                                 ret = _context4.sent;
 
                                 getCardList && getCardList(cardList && cardList.length > 1 ? cardList[0].MemberMobile : StorageCardNo);
                                 _tplusComponentsTouch.Message.success('退储值成功！');
-                                _context4.next = 20;
+                                _context4.next = 18;
                                 return this.setState({
                                     refundBtnDisabled: false,
                                     refundShow: false
                                 });
 
-                            case 20:
-                                _context4.next = 28;
+                            case 18:
+                                _context4.next = 26;
                                 break;
 
-                            case 22:
-                                _context4.prev = 22;
-                                _context4.t0 = _context4['catch'](12);
+                            case 20:
+                                _context4.prev = 20;
+                                _context4.t0 = _context4['catch'](10);
 
                                 console.log(_context4.t0);
-                                _context4.next = 27;
+                                _context4.next = 25;
                                 return this.setState({
                                     refundBtnDisabled: false
                                 });
 
-                            case 27:
+                            case 25:
                                 this.returnedCash('\u9000\u6B3E\u5931\u8D25\uFF0C\u53EA\u80FD\u9000\u73B0\u91D1\uFF0C\u662F\u5426\u7EE7\u7EED', storageAmount);
 
-                            case 28:
+                            case 26:
                             case 'end':
                                 return _context4.stop();
                         }
                     }
-                }, _callee4, this, [[12, 22]]);
+                }, _callee4, this, [[10, 20]]);
             }));
 
             function submitRefundStorage() {
@@ -639,8 +637,8 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
                     });
                 }
                 if (ret === true) {
-                    var _ref10 = _mutantsUtil.platform || {},
-                        isHorizontalSunMi = _ref10.isHorizontalSunMi;
+                    var _ref11 = _mutantsUtil.platform || {},
+                        isHorizontalSunMi = _ref11.isHorizontalSunMi;
 
                     switch (key) {
                         case 'storage':
@@ -691,16 +689,16 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
                 _props10$cardList = _props10.cardList,
                 cardList = _props10$cardList === undefined ? [] : _props10$cardList;
 
-            var _ref11 = cardList.length && cardList[selected] || {},
-                Id = _ref11.Id,
-                _ref11$BalanceStorage = _ref11.BalanceStorage,
-                BalanceStorage = _ref11$BalanceStorage === undefined ? 0 : _ref11$BalanceStorage,
-                _ref11$PresentAmount = _ref11.PresentAmount,
-                PresentAmount = _ref11$PresentAmount === undefined ? 0 : _ref11$PresentAmount,
-                WalletEnabled = _ref11.WalletEnabled,
-                CardTypeEnum = _ref11.CardTypeEnum,
-                CardStatusEnum = _ref11.CardStatusEnum,
-                StorageCardNo = _ref11.StorageCardNo;
+            var _ref12 = cardList.length && cardList[selected] || {},
+                Id = _ref12.Id,
+                _ref12$BalanceStorage = _ref12.BalanceStorage,
+                BalanceStorage = _ref12$BalanceStorage === undefined ? 0 : _ref12$BalanceStorage,
+                _ref12$PresentAmount = _ref12.PresentAmount,
+                PresentAmount = _ref12$PresentAmount === undefined ? 0 : _ref12$PresentAmount,
+                WalletEnabled = _ref12.WalletEnabled,
+                CardTypeEnum = _ref12.CardTypeEnum,
+                CardStatusEnum = _ref12.CardStatusEnum,
+                StorageCardNo = _ref12.StorageCardNo;
 
             return _react2.default.createElement(
                 'div',
@@ -741,10 +739,10 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
                         cancel: this.changePasswordCancel,
                         btnDissabled: btnDissabled
                     },
-                    passwordTitle === '换卡' ? _react2.default.createElement(_changeMemberCard2.default, { cardList: cardList && cardList.length && cardList[selected], modifyMember: modifyMember, member: member, ref: function ref(_ref12) {
-                            return _this4.modifyPass = _ref12;
-                        }, cancelModal: this.changePasswordCancel }) : _react2.default.createElement(_modifyPass2.default, { menuKey: menuKey, cardListCopy: cardList, cardList: cardList && cardList.length && cardList[selected], changeBtnDisabled: this.changeBtnDisabled, loadUserInfo: getCardList, selected: selected, storageInit: this.storageInit, passwordTitle: CardTypeEnum === 'BALANCE_CARD' && !WalletEnabled ? '设置密码' : passwordTitle, modifyMember: modifyMember, ref: function ref(_ref13) {
+                    passwordTitle === '换卡' ? _react2.default.createElement(_changeMemberCard2.default, { cardList: cardList && cardList.length && cardList[selected], modifyMember: modifyMember, member: member, ref: function ref(_ref13) {
                             return _this4.modifyPass = _ref13;
+                        }, cancelModal: this.changePasswordCancel }) : _react2.default.createElement(_modifyPass2.default, { menuKey: menuKey, cardListCopy: cardList, cardList: cardList && cardList.length && cardList[selected], changeBtnDisabled: this.changeBtnDisabled, loadUserInfo: getCardList, selected: selected, storageInit: this.storageInit, passwordTitle: CardTypeEnum === 'BALANCE_CARD' && !WalletEnabled ? '设置密码' : passwordTitle, modifyMember: modifyMember, ref: function ref(_ref14) {
+                            return _this4.modifyPass = _ref14;
                         }, member: member, cancelModal: this.changePasswordCancel })
                 ),
                 _react2.default.createElement(
@@ -759,8 +757,8 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
                         btnDissabled: bindCardBtnDisabled
                     },
                     _react2.default.createElement(_bindCard2.default, {
-                        ref: function ref(_ref14) {
-                            return _this4.bindCardRef = _ref14;
+                        ref: function ref(_ref15) {
+                            return _this4.bindCardRef = _ref15;
                         },
                         bindCardClick: this.bindCardClick,
                         changeBindCardBtnDisabled: this.changeBindCardBtnDisabled
@@ -882,8 +880,8 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
             _props12$selected = _props12.selected,
             selected = _props12$selected === undefined ? 0 : _props12$selected;
 
-        var _ref15 = cardList[selected] || {},
-            StorageCardNo = _ref15.StorageCardNo;
+        var _ref16 = cardList[selected] || {},
+            StorageCardNo = _ref16.StorageCardNo;
 
         _mutantsMicrofx.stores.memberStore.init({
             cardInfo: cardList[selected],
@@ -926,7 +924,7 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
             title: '提示',
             content: '确定要挂失该会员卡吗？',
             onOk: function () {
-                var _ref16 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5() {
+                var _ref17 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5() {
                     return _regenerator2.default.wrap(function _callee5$(_context5) {
                         while (1) {
                             switch (_context5.prev = _context5.next) {
@@ -958,7 +956,7 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
                 }));
 
                 return function onOk() {
-                    return _ref16.apply(this, arguments);
+                    return _ref17.apply(this, arguments);
                 };
             }(),
             onCancel: function onCancel() {},
@@ -978,7 +976,7 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
             title: '提示',
             content: '确定要取消挂失该会员卡吗？',
             onOk: function () {
-                var _ref17 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6() {
+                var _ref18 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6() {
                     return _regenerator2.default.wrap(function _callee6$(_context6) {
                         while (1) {
                             switch (_context6.prev = _context6.next) {
@@ -1010,7 +1008,7 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
                 }));
 
                 return function onOk() {
-                    return _ref17.apply(this, arguments);
+                    return _ref18.apply(this, arguments);
                 };
             }(),
             onCancel: function onCancel() {},
@@ -1027,12 +1025,12 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
             selected = _props15$selected === undefined ? 0 : _props15$selected,
             memberEnumState = _props15.memberEnumState;
 
-        var _ref18 = member || {},
-            ID = _ref18.ID,
-            _ref18$MemberType = _ref18.MemberType;
+        var _ref19 = member || {},
+            ID = _ref19.ID,
+            _ref19$MemberType = _ref19.MemberType;
 
-        _ref18$MemberType = _ref18$MemberType === undefined ? {} : _ref18$MemberType;
-        var IsStorage = _ref18$MemberType.IsStorage;
+        _ref19$MemberType = _ref19$MemberType === undefined ? {} : _ref19$MemberType;
+        var IsStorage = _ref19$MemberType.IsStorage;
 
         memberStore.GetMemberDTO(ID, false).then(function (ret) {
             _mutantsMicrofx.stores.selectMemberStore.setCurMemberInfo(ret);
@@ -1073,8 +1071,8 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
             _props16$selected = _props16.selected,
             selected = _props16$selected === undefined ? 0 : _props16$selected;
 
-        var _ref19 = cardList[selected] || {},
-            ID = _ref19.ID;
+        var _ref20 = cardList[selected] || {},
+            ID = _ref20.ID;
 
         if (!!ID) {
             _tplusComponentsTouch.Message.error('该储值卡已经绑定，不能再次进行绑定');
@@ -1111,41 +1109,45 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
     };
 
     this.changeRefundOk = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7() {
-        var _props17, _props17$cardList, cardList, _props17$selected, selected, _ref21, MeStorageCardId, _ref21$BalanceStorage, BalanceStorage, _ref21$PresentAmount, PresentAmount, StorageCardNo, ID, _ref21$LatestStorageI, latestStorageAmount, paymentTypeId, finAccountId, refundable, storageAmount;
+        var _props17, _props17$cardList, cardList, _props17$selected, selected, _ref22, MeStorageCardId, _ref22$BalanceStorage, BalanceStorage, _ref22$PresentAmount, PresentAmount, StorageCardNo, ID, lastesStorageResult, _ref23, latestStorageAmount, refundable, storageAmount;
 
         return _regenerator2.default.wrap(function _callee7$(_context7) {
             while (1) {
                 switch (_context7.prev = _context7.next) {
                     case 0:
                         _props17 = _this5.props, _props17$cardList = _props17.cardList, cardList = _props17$cardList === undefined ? [] : _props17$cardList, _props17$selected = _props17.selected, selected = _props17$selected === undefined ? 0 : _props17$selected;
-                        _ref21 = cardList.length && cardList[selected] || {}, MeStorageCardId = _ref21.MeStorageCardId, _ref21$BalanceStorage = _ref21.BalanceStorage, BalanceStorage = _ref21$BalanceStorage === undefined ? 0 : _ref21$BalanceStorage, _ref21$PresentAmount = _ref21.PresentAmount, PresentAmount = _ref21$PresentAmount === undefined ? 0 : _ref21$PresentAmount, StorageCardNo = _ref21.StorageCardNo, ID = _ref21.ID, _ref21$LatestStorageI = _ref21.LatestStorageInfo;
-                        _ref21$LatestStorageI = _ref21$LatestStorageI === undefined ? {} : _ref21$LatestStorageI;
-                        latestStorageAmount = _ref21$LatestStorageI.latestStorageAmount, paymentTypeId = _ref21$LatestStorageI.paymentTypeId, finAccountId = _ref21$LatestStorageI.finAccountId;
+                        _ref22 = cardList.length && cardList[selected] || {}, MeStorageCardId = _ref22.MeStorageCardId, _ref22$BalanceStorage = _ref22.BalanceStorage, BalanceStorage = _ref22$BalanceStorage === undefined ? 0 : _ref22$BalanceStorage, _ref22$PresentAmount = _ref22.PresentAmount, PresentAmount = _ref22$PresentAmount === undefined ? 0 : _ref22$PresentAmount, StorageCardNo = _ref22.StorageCardNo, ID = _ref22.ID;
+                        _context7.next = 4;
+                        return _this5.api.getLatestStorageAmount(MeStorageCardId);
+
+                    case 4:
+                        lastesStorageResult = _context7.sent;
+                        _ref23 = lastesStorageResult.data || {}, latestStorageAmount = _ref23.latestStorageAmount;
                         refundable = parseFloat((0, _utils.getFixedNumber)(BalanceStorage - PresentAmount));
                         storageAmount = (0, _utils.getFixedNumber)(0 - (BalanceStorage - PresentAmount));
                         // 退款只支持退最后一次储值的金额，如果最后一次储值的金额小于可退金额，弹出提示。
 
                         if (!(latestStorageAmount && latestStorageAmount < refundable)) {
-                            _context7.next = 9;
+                            _context7.next = 11;
                             break;
                         }
 
                         _this5.returnedCash('\u9000\u6B3E\u5927\u4E8E\u6700\u540E\u4E00\u6B21\u50A8\u503C\u91D1\u989D\uFF0C\u65E0\u6CD5\u539F\u8DEF\u9000\u56DE\uFF0C\u53EA\u53EF\u9000\u73B0\u91D1\uFF01\u662F\u5426\u9000\u6B3E\uFF1F', storageAmount);
                         return _context7.abrupt('return');
 
-                    case 9:
-                        if (!(Number(storageAmount) === 0)) {
-                            _context7.next = 12;
+                    case 11:
+                        if (!(Number(refundable) <= 0)) {
+                            _context7.next = 14;
                             break;
                         }
 
                         _tplusComponentsTouch.Message.error('无可退金额，不支持退款！');
                         return _context7.abrupt('return');
 
-                    case 12:
-                        _this5.submitRefundStorage(cardList[selected], storageAmount);
+                    case 14:
+                        _this5.submitRefundStorage(cardList[selected], storageAmount, lastesStorageResult.data);
 
-                    case 13:
+                    case 15:
                     case 'end':
                         return _context7.stop();
                 }
@@ -1160,8 +1162,8 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
             _props18$selected = _props18.selected,
             selected = _props18$selected === undefined ? 0 : _props18$selected;
 
-        var _ref22 = cardList[selected] || {},
-            Id = _ref22.Id;
+        var _ref24 = cardList[selected] || {},
+            Id = _ref24.Id;
 
         cardList[selected].meMemberId = Id;
         cardList[selected].isRefundStorage = 1; // 自己添加参数，用来判断是储值还是退储值
@@ -1183,11 +1185,11 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
             _props19$selected = _props19.selected,
             selected = _props19$selected === undefined ? 0 : _props19$selected;
 
-        var _ref23 = cardList[selected] || {},
-            StorageCardNo = _ref23.StorageCardNo,
-            MemberMobile = _ref23.MemberMobile,
-            MemberName = _ref23.MemberName,
-            ID = _ref23.ID;
+        var _ref25 = cardList[selected] || {},
+            StorageCardNo = _ref25.StorageCardNo,
+            MemberMobile = _ref25.MemberMobile,
+            MemberName = _ref25.MemberName,
+            ID = _ref25.ID;
 
         if (!ID) {
             _tplusComponentsTouch.Message.error('该卡未绑定会员');
@@ -1198,7 +1200,7 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
             content: '\u6B64\u5361\u5C5E\u4E8E' + (MemberName || MemberMobile) + '\u4F1A\u5458\uFF0C\u786E\u8BA4\u89E3\u7ED1\u5417\uFF1F',
             confirmLoading: _this5.state.memberUnBindCardLoading,
             onOk: function () {
-                var _ref24 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee8() {
+                var _ref26 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee8() {
                     return _regenerator2.default.wrap(function _callee8$(_context8) {
                         while (1) {
                             switch (_context8.prev = _context8.next) {
@@ -1229,7 +1231,7 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
                 }));
 
                 return function onOk() {
-                    return _ref24.apply(this, arguments);
+                    return _ref26.apply(this, arguments);
                 };
             }()
         });
@@ -1249,14 +1251,14 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
             _props20$selected = _props20.selected,
             selected = _props20$selected === undefined ? 0 : _props20$selected;
 
-        var _ref25 = _this5.state || {},
-            setPwdShortKey = _ref25.setPwdShortKey;
+        var _ref27 = _this5.state || {},
+            setPwdShortKey = _ref27.setPwdShortKey;
 
         var newStyle = _mutantsUtil.localStore && _mutantsUtil.localStore.get('voucherDefaultPosMode') == 'voucher';
 
-        var _ref26 = cardList && cardList.length && cardList[selected] || {},
-            WalletEnabled = _ref26.WalletEnabled,
-            CardTypeEnum = _ref26.CardTypeEnum;
+        var _ref28 = cardList && cardList.length && cardList[selected] || {},
+            WalletEnabled = _ref28.WalletEnabled,
+            CardTypeEnum = _ref28.CardTypeEnum;
         // 控制显示修改密码还是设置密码