From ccdc5690f7f4705611a2f57a7cf45da352b6e7e4 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Mon, 19 Apr 2021 17:51:58 +0800 Subject: [PATCH] modify --- zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml | 4 ++++ zq-erp/src/main/java/com/matrix/system/dataMove/DateMoveServiceImpl.java | 6 ++++++ zq-erp/src/main/java/com/matrix/system/hive/bean/AchieveNew.java | 10 ++++++++++ 3 files changed, 20 insertions(+), 0 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/dataMove/DateMoveServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/dataMove/DateMoveServiceImpl.java index 9676262..7c87430 100644 --- a/zq-erp/src/main/java/com/matrix/system/dataMove/DateMoveServiceImpl.java +++ b/zq-erp/src/main/java/com/matrix/system/dataMove/DateMoveServiceImpl.java @@ -1534,6 +1534,12 @@ } else { achieveNew.setPayMethod("划扣"); } + +// if (achieveNew.getConsume() == null) { +// achieveNew.setPayMethod("现金"); +// } else { +// achieveNew.setPayMethod("划扣"); +// } achieveNew.setAchieveType("顾问业绩"); achieveNew.setGoodsCash(Double.parseDouble(achieveNew.getT1())); achieveNewDao.updateByModel(achieveNew); diff --git a/zq-erp/src/main/java/com/matrix/system/hive/bean/AchieveNew.java b/zq-erp/src/main/java/com/matrix/system/hive/bean/AchieveNew.java index dcfc9cf..084cd02 100644 --- a/zq-erp/src/main/java/com/matrix/system/hive/bean/AchieveNew.java +++ b/zq-erp/src/main/java/com/matrix/system/hive/bean/AchieveNew.java @@ -247,6 +247,16 @@ private String cateName; + private Double consume; + + public Double getConsume() { + return consume; + } + + public void setConsume(Double consume) { + this.consume = consume; + } + public String getCateName() { return cateName; } diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml index 0e379c1..1e20546 100644 --- a/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml +++ b/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml @@ -17,6 +17,7 @@ <result property="vipId" column="vip_id" /> <result property="freeConsume" column="free_consume" /> <result property="hisConsume" column="his_consume" /> + <result property="consume" column="consume" /> <result property="goodsCash" column="goods_cash" /> <result property="projNum" column="proj_num" /> <result property="numberOfPeople" column="number_of_people" /> @@ -725,6 +726,9 @@ <if test="record.t9 != null and record.t9 != '' "> t9 = #{record.t9}, </if> + <if test="record.payMethod != null and record.payMethod != '' "> + pay_method = #{record.payMethod}, + </if> </set> WHERE id=#{record.id} </update> -- Gitblit v1.9.1