jufubao-admin-library 1.1.221 → 1.1.223

package/library/pageComponents/modules/JfbProductDialog.vue

@@ -348,6 +348,7 @@ export default {
             this.adjustListValue.ratioValue = '';
             this.adjustListValue.moneyValue = '';
           }
+          this.adjustListValue.allow_below_cost = false;
           this.getAdjustForm(this.adjustListValue)
         }
       }
@@ -355,6 +356,7 @@ export default {
     'adjustListValue.vip_unit':{
       handler(n,o){
         if(n&&n!==o){
+          this.adjustListValue.vip_allow_below_cost = false;
           this.getAdjustForm(this.adjustListValue)
         }
       }
@@ -1161,6 +1163,17 @@ export default {
           ele: 'slot',
           slot:'showPrice'
         },
+        {
+          label: "是否低于成本:",
+          ele: "xd-radio",
+          valueKey: "allow_below_cost",
+          value: params.allow_below_cost ?? false,
+          list: [
+            { "label": "不允许低于成本", "value": false },
+            { "label": "允许低于成本", "value": true }
+          ],
+          inline: true
+        },
         this.isShowVipSet&&{
           label: 'PLUS售价调整',
           ele: 'title',
@@ -1318,6 +1331,17 @@ export default {
           ele: 'slot',
           slot:'showVipPrice'
         },
+        this.isShowVipSet && {
+          label: "是否低于成本:",
+          ele: "xd-radio",
+          valueKey: "vip_allow_below_cost",
+          value: params.vip_allow_below_cost ?? false,
+          list: [
+            { "label": "不允许低于成本", "value": false },
+            { "label": "允许低于成本", "value": true }
+          ],
+          inline: true
+        },
         this.sku_count>1&&{
           ele:'slot',
           slot:'sku_table'
@@ -1412,7 +1436,7 @@ export default {
       });
     },
     getAdjustParams () {
-      const { product_id, unit, base,decimal,rounding_method,ratioValue, moneyValue,vip_unit, vip_base,vip_decimal,vip_rounding_method,vipRatioValue, vipMoneyValue} = this.adjustListValue;
+      const { product_id, unit, base,decimal,rounding_method,ratioValue, moneyValue,vip_unit, vip_base,vip_decimal,vip_rounding_method,vipRatioValue, vipMoneyValue,allow_below_cost, vip_allow_below_cost} = this.adjustListValue;
       let value = 0;
       if(unit === 'ratio') value = Number(ratioValue);
       if(unit === 'money') value = Number(moneyValue);
@@ -1430,6 +1454,7 @@ export default {
           base: unit === 'fixed' ? 'jfb_price' : base,
           decimal: unit === 'fixed' ? 0 : decimal,
           rounding_method: unit === 'fixed' ? 'ceil' : rounding_method,
+          allow_below_cost: allow_below_cost ?? false,
         }
       };
 
@@ -1440,6 +1465,7 @@ export default {
           decimal: vip_unit === 'fixed' ? 0 : vip_decimal,
           rounding_method: vip_unit === 'fixed' ? 'ceil' : vip_rounding_method,
           value: this.$xdHelper.multiplyFloatNumber(Number(vip_value), 100),
+          allow_below_cost: vip_allow_below_cost ?? false,
         };
       }
       
@@ -1794,7 +1820,8 @@ export default {
           fn: 'selected-products-skus',
           path: 'p3',
           params:{
-            product_id:this.dialogRow.product_id
+            product_id: this.dialogRow.product_id,
+            status: 'Y'
           }
         })
         console.log(res,'aaaaaa')

package/library/viewModules/viewsFinance/viewsFinance/balance/components/listOpenapi.vue

@@ -30,6 +30,65 @@
         ></xd-pagination>
       </div>
     </el-card>
+    <xd-dialog
+      v-if="showNoticeSetting"
+      title=""
+      :show.sync="showNoticeSetting"
+      width="500px"
+    >
+      <xd-base-dynamic-field
+        :key="randomKey"
+        v-if="setFormList !== null"
+        ref="setForm"
+        v-model="setFormParams"
+        :list="setFormList"
+        size="medium"
+        @success="handleSuccess"
+        @onApiSuccessUrl="handleApiSuccessUrl"
+        @onGetParamsAndHeader="handlePrivateGetParamsAndHeader"
+      >
+        <template slot="set" slot-scope="scope">
+          <el-form
+            :label-width="scope.width"
+            :model="customForm"
+            :rules="customRules"
+            ref="customForm"
+            @submit.native.prevent
+          >
+            <el-form-item prop="frequency_type" label="通知频次:" required>
+              <el-select v-model="customForm.frequency_type" placeholder="请选择" style="margin-bottom: 5px;">
+                <el-option
+                  v-for="item in optionsData['frequency_type_list']"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
+              </el-select>
+              <el-select multiple v-if="customForm.frequency_type&&customForm.frequency_type==='week'" v-model="customForm.frequency_val" style="margin-bottom: 5px;" placeholder="请选择">
+                <el-option
+                  v-for="item in weekData"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
+              </el-select>
+              <el-select multiple v-model="customForm.frequency_time_val" style="margin-bottom: 5px;" placeholder="请选择">
+                <el-option
+                  v-for="item in frequencyTimeData"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-form>
+        </template>
+      </xd-base-dynamic-field>
+      <div slot="btn">
+        <el-button type="default" @click="showNoticeSetting=false">取消</el-button>
+        <el-button type="primary" @click="handleNoticeSetting">确定</el-button>
+      </div>
+    </xd-dialog>
   </div>
 </template>
 
@@ -38,6 +97,8 @@
 import XdSearch from "@/components/XdSearch";
 import XdPagination from "@/components/XdPagination.vue";
 import XdTable from "@/components/XdTable";
+import XdDialog from "@/components/XdDialog.vue";
+import XdBaseDynamicField from "@/components/XdBaseDynamicField";
 import { mapActions } from "vuex";
 import { getOptions } from "@/utils/options";
 import { baseJsDateToTime } from "@/utils/xd.base.js";
@@ -47,26 +108,86 @@ import roleTRecord from "@/constant/modules/tradeRecord.js";
 export default {
   name: "listOpenapi",
   components: {
-    XdPagination, //翻译插件
-    XdSearch, //搜查插件
+    XdPagination,
+    XdSearch,
     XdTable,
+    XdDialog,
+    XdBaseDynamicField,
   },
   data() {
     return {
       //分页参数
-      page_token: 1, //当前页面数量
-      hasNextPage: true, //是否有下一页
-      page_size: 20, //搜索参数
-      searchForm: [], //搜索区域模块表单
-      searchParams: null, //搜索参数
+      page_token: 1,
+      hasNextPage: true,
+      page_size: 20,
+      searchForm: [],
+      searchParams: null,
       totalData: {},
       total: 0,
       categoryList: [],
 
       //列表对象
       tables: [],
+      //余额通知设置
+      showNoticeSetting: false,
+      editRow: null,
+      randomKey: 'randomKey',
+      setFormList: [],
+      setFormParams: null,
+      optionsData: [],
+      frequencyTimeData: [
+        {label:'00:00',value:'00:00'},{label:'01:00',value:'01:00'},{label:'02:00',value:'02:00'},{label:'03:00',value:'03:00'},{label:'04:00',value:'04:00'},{label:'05:00',value:'05:00'},{label:'06:00',value:'06:00'},{label:'07:00',value:'07:00'},{label:'08:00',value:'08:00'},
+        {label:'09:00',value:'09:00'},{label:'10:00',value:'10:00'},{label:'11:00',value:'11:00'},{label:'12:00',value:'12:00'},{label:'13:00',value:'13:00'},{label:'14:00',value:'14:00'},{label:'15:00',value:'15:00'},{label:'16:00',value:'16:00'},
+        {label:'17:00',value:'17:00'},{label:'18:00',value:'18:00'},{label:'19:00',value:'19:00'},{label:'20:00',value:'20:00'},{label:'21:00',value:'21:00'},{label:'22:00',value:'22:00'},{label:'23:00',value:'23:00'}
+      ],
+      customForm: {
+        frequency_type: '',
+        frequency_val: [],
+        frequency_time_val: [],
+      },
+      customRules: {},
+      weekData: [],
+      wallet_type: '',
+      owner_id: '',
     };
   },
+  watch: {
+    showNoticeSetting: {
+      handler(n, o) {
+        if (!n) {
+          this.customForm = {
+            frequency_type: '',
+            frequency_val: [],
+            frequency_time_val: [],
+          };
+          this.setFormParams = null;
+        }
+      }
+    },
+    'setFormParams.notify_mode': {
+      handler(n, o) {
+        if (n && n !== o) {
+          this.initFormList(this.setFormParams);
+        }
+      },
+      deep: true,
+      immediate: true,
+    },
+    'customForm.frequency_val': {
+      handler(n, o) {
+        if (n && JSON.stringify(n) !== JSON.stringify(o)) {
+          this.customForm.frequency_val.sort();
+        }
+      }
+    },
+    'customForm.frequency_time_val': {
+      handler(n, o) {
+        if (n && JSON.stringify(n) !== JSON.stringify(o)) {
+          this.customForm.frequency_time_val.sort();
+        }
+      }
+    },
+  },
   computed: {
     headers() {
       return [
@@ -111,17 +232,30 @@ export default {
           label: "操作",
           values: [
             { ui: "text-button", name: "对账", type: "text", event: "detail" },
-          ],
+            {
+              ui: "text-button",
+              name: "余额通知",
+              type: "text",
+              event: "notice",
+            },
+          ].filter((item) => item),
         },
       ].filter((item) => item);
     },
   },
   created() {
     this.initSearchForm();
+    getOptions({
+      server: 'finance-partner',
+      fn: 'wallet/notify-config',
+      path: 'p1',
+    }).then(res => {
+      this.optionsData = res.data;
+      this.weekData = res.data['frequency_val_week_list'];
+    });
   },
   methods: {
-    ...mapActions("wallet", ["listOpenApiWallet"]),
-    //相除
+    ...mapActions("wallet", ["listOpenApiWallet", "channelAmountNotice", "notifyConfigGet", "notifyConfigSet"]),
     divide(price) {
       return this.$xdHelper.divisionFloatNumber(price, 100);
     },
@@ -153,7 +287,6 @@ export default {
      * @description 获取数据列表
      */
     getList() {
-      //请求数据
       let params = {
         ...this.searchParams,
         page_token: this.page_token,
@@ -198,8 +331,144 @@ export default {
             open_user_name: row.open_user_name,
           },
         });
+      } else if (value.event === "notice") {
+        this.wallet_type = row.wallet_type;
+        this.owner_id = row.open_user_id;
+        this.editRow = row;
+        // 获取已有配置并回显
+        this.notifyConfigGet({owner_id: row.open_user_id, event: "opt"}).then(res => {
+          let confResult = res.data.config_result;
+          if (res.data.config_result.frequency_val) {
+            res.data.config_result.frequency_val = JSON.parse(res.data.config_result.frequency_val);
+          }
+          if (res.data.config_result.frequency_time_val) {
+            res.data.config_result.frequency_time_val = JSON.parse(res.data.config_result.frequency_time_val);
+          }
+          this.customForm = {
+            frequency_type: res.data.config_result['frequency_type'] || '',
+            frequency_val: res.data.config_result['frequency_val'] || [],
+            frequency_time_val: res.data.config_result['frequency_time_val'] || [],
+          };
+          let params = {
+            ...res.data.config_result,
+            remind_threshold_amount: confResult.remind_threshold_amount
+              ? this.divide(confResult.remind_threshold_amount)
+              : '',
+          };
+          this.initFormList(params);
+          this.showNoticeSetting = true;
+        }).catch(() => {
+          // 如果获取配置失败，使用默认值
+          let params = {
+            notify_mode: 'default',
+            remind_threshold_amount: row.remind_threshold_amount
+              ? this.divide(row.remind_threshold_amount)
+              : '',
+          };
+          this.initFormList(params);
+          this.showNoticeSetting = true;
+        });
       }
     },
+    initFormList(params) {
+      let formList = [
+        {
+          label: '通知设置:',
+          ele: 'xd-radio',
+          valueKey: 'notify_mode',
+          value: params.notify_mode || 'default',
+          list: this.optionsData['notify_mode_list'],
+          rules: [
+            { required: true, message: '请选择通知设置', trigger: 'change' },
+          ]
+        },
+        {
+          label: '提醒阈值:',
+          ele: 'xd-input-unit',
+          valueKey: 'remind_threshold_amount',
+          value: params.remind_threshold_amount || '5000',
+          setting: {
+            unit: '元', pos: 'append',
+            before: "余额不足",
+            tips:"时触发通知"
+           },
+          rules: [
+            { required: true, message: '请输入阈值', trigger: 'blur' },
+          ]
+        },
+        params.notify_mode === 'default' && {
+          label: '通知频次:',
+          ele: 'el-html',
+          value: this.optionsData['default_time_tip']
+        },
+        params.notify_mode === 'custom' && {
+          label: '通知频次:',
+          ele: 'slot',
+          slot: 'set'
+        },
+      ].filter(i => i);
+      this.setFormList = formList;
+      this.randomKey = Date.now();
+    },
+    handleNoticeSetting() {
+      this.$refs.setForm.submit().then(() => {
+        if (this.setFormParams.notify_mode === 'custom') {
+          if (!this.customForm.frequency_type) {
+            this.$message({
+              type: 'error',
+              message: '通知频次不能为空',
+            });
+            return;
+          }
+          if (this.customForm.frequency_type === 'day') {
+            if (!this.customForm.frequency_type || this.customForm.frequency_time_val.length === 0) {
+              this.$message({
+                type: 'error',
+                message: '请填写完整通知频次信息'
+              });
+              return;
+            }
+          } else if (this.customForm.frequency_type === 'week') {
+            if (!this.customForm.frequency_type || this.customForm.frequency_val.length === 0 || this.customForm.frequency_time_val.length === 0) {
+              this.$message({
+                type: 'error',
+                message: '请填写完整通知频次信息'
+              });
+              return;
+            }
+          }
+        }
+        let copySetFormParams = this.$xdHelper.cloneDeep(this.setFormParams);
+        let copyCustomForm = this.$xdHelper.cloneDeep(this.customForm);
+        if (copySetFormParams.notify_mode === 'default') {
+          delete copyCustomForm['frequency_type'];
+          delete copyCustomForm['frequency_val'];
+          delete copyCustomForm['frequency_time_val'];
+        }
+        if (copyCustomForm.frequency_type === 'day') {
+          copyCustomForm.frequency_val = [];
+        }
+        if (copyCustomForm.frequency_time_val) {
+          copyCustomForm.frequency_time_val = JSON.stringify(this.customForm.frequency_time_val);
+        }
+        if (copyCustomForm.frequency_val) {
+          copyCustomForm.frequency_val = JSON.stringify(this.customForm.frequency_val);
+        }
+        // 先设置通知频次配置（阈值需要转换为分）
+        const configResult = { ...copySetFormParams, ...copyCustomForm, owner_id: this.editRow.open_user_id };
+        if (configResult.remind_threshold_amount) {
+          configResult.remind_threshold_amount = this.$xdHelper.multiplyFloatNumber(configResult.remind_threshold_amount, 100);
+        }
+        this.notifyConfigSet({ owner_id: this.editRow.open_user_id, event: "opt", config_result: configResult }).then(() => {
+          this.$message({
+            type: 'success',
+            message: '设置成功'
+          });
+          this.showNoticeSetting = false;
+          this.getList();
+        }).catch(() => {});
+      }).catch(() => {});
+    },
     /**
      * @description 初始化搜索模块
      */
@@ -250,7 +519,7 @@ export default {
     handlePagination(page) {
       this.page_token = page;
       this.getList();
-    }, //todo
+    },
   },
 };
 </script>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-admin-library",
-  "version": "1.1.221",
+  "version": "1.1.223",
   "description": "聚福宝福利后台管理系统公共模块",
   "author": "goashiyong <gaoshiyong1272@vip.163.com>",
   "scripts": {