From f7d131702da095fa291d76ddea3d9acc8cd2af76 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 26 Feb 2021 16:49:11 +0800
Subject: [PATCH] 20210226 积分商城基础数据上传
---
zq-erp/src/main/java/com/matrix/system/score/service/ScoreGoodsService.java | 20
zq-erp/src/main/resources/mybatis/mapper/score/ScoreUseRecordDao.xml | 43 +
zq-erp/src/main/java/com/matrix/system/score/dao/ScoreGoodsCategoryDao.java | 13
zq-erp/src/main/java/com/matrix/system/score/service/ScoreShoppingCarService.java | 20
zq-erp/src/main/java/com/matrix/system/score/entity/ScoreOrderItem.java | 75 ++
zq-erp/src/main/java/com/matrix/system/score/service/ScoreGoodsImageService.java | 20
zq-erp/src/main/resources/mybatis/mapper/score/ScoreGoodsNavigationDao.xml | 31
zq-erp/src/main/resources/mybatis/mapper/score/ScoreShoppingCarDao.xml | 33 +
zq-erp/src/main/java/com/matrix/system/score/service/ScoreOrderService.java | 92 --
zq-erp/src/main/java/com/matrix/system/score/entity/ScoreGoodsNavigation.java | 47 +
zq-erp/src/main/java/com/matrix/system/score/action/ScoreShoppingCarAction.java | 21
zq-erp/src/main/resources/mybatis/mapper/score/ScoreGoodsCategoryDao.xml | 33 +
zq-erp/src/main/java/com/matrix/system/score/service/ScoreOrderItemService.java | 20
zq-erp/src/main/java/com/matrix/system/score/entity/ScoreUseRecord.java | 89 ++
zq-erp/src/main/resources/mybatis/mapper/score/ScoreOrderItemDao.xml | 39 +
zq-erp/src/main/java/com/matrix/system/score/dto/ScoreRuleSettingDto.java | 2
zq-erp/src/main/java/com/matrix/system/score/mapper/ScoreRuleSettingMapper.java | 2
zq-erp/src/main/java/com/matrix/system/score/entity/ScoreVipDetail.java | 91 ++
zq-erp/src/main/java/com/matrix/system/score/action/ScoreGoodsAction.java | 21
zq-erp/src/main/java/com/matrix/system/score/action/ScoreGoodsSkuAction.java | 21
zq-erp/src/main/java/com/matrix/system/score/action/ScoreVipDetailAction.java | 21
zq-erp/src/main/java/com/matrix/system/score/action/ScoreUseRecordAction.java | 21
zq-erp/src/main/resources/mybatis/mapper/score/ScoreVipDetailDao.xml | 43 +
zq-erp/src/main/java/com/matrix/system/score/action/ScoreGoodsCategoryAction.java | 21
zq-erp/src/main/java/com/matrix/system/score/action/ScoreOrderAction.java | 21
zq-erp/src/main/java/com/matrix/system/score/entity/ScoreGoodsCategory.java | 54 +
zq-erp/src/main/java/com/matrix/system/score/dao/ScoreOrderItemDao.java | 17
zq-erp/src/main/java/com/matrix/system/score/entity/ScoreGoodsImage.java | 61 +
zq-erp/src/main/java/com/matrix/system/score/dao/ScoreVipDetailDao.java | 17
zq-erp/src/main/java/com/matrix/system/score/entity/ScoreRuleSettingEntity.java | 2
zq-erp/src/main/java/com/matrix/system/score/dao/ScoreGoodsDao.java | 17
zq-erp/src/main/java/com/matrix/system/score/dao/ScoreGoodsSkuDao.java | 17
zq-erp/src/main/resources/mybatis/mapper/score/ScoreOrderDao.xml | 50 +
zq-erp/src/main/java/com/matrix/system/score/dao/ScoreRuleSettingDao.java | 11
zq-erp/src/main/java/com/matrix/system/score/dao/ScoreGoodsImageDao.java | 17
zq-erp/src/main/java/com/matrix/system/score/entity/ScoreOrder.java | 126 +++
zq-erp/src/main/java/com/matrix/system/score/service/ScoreVipDetailService.java | 20
zq-erp/src/main/resources/mybatis/mapper/score/ScoreGoodsSkuDao.xml | 41 +
zq-erp/src/main/java/com/matrix/system/score/action/ScoreRuleSettingAction.java | 18
zq-erp/src/main/resources/mybatis/mapper/score/ScoreRuleSettingDao.xml | 5
zq-erp/src/main/java/com/matrix/system/score/dao/ScoreOrderDao.java | 28
zq-erp/src/main/java/com/matrix/system/score/entity/ScoreShoppingCar.java | 54 +
zq-erp/src/main/java/com/matrix/system/score/dao/ScoreShoppingCarDao.java | 17
zq-erp/src/main/java/com/matrix/system/score/service/ScoreGoodsCategoryService.java | 20
zq-erp/src/main/java/com/matrix/system/score/service/ScoreRuleSettingService.java | 65 +
zq-erp/src/main/java/com/matrix/system/score/action/ScoreGoodsNavigationAction.java | 21
zq-erp/src/main/java/com/matrix/system/score/entity/ScoreGoods.java | 103 +++
zq-erp/src/main/java/com/matrix/system/score/action/ScoreGoodsImageAction.java | 21
zq-erp/src/main/java/com/matrix/system/score/dao/ScoreGoodsNavigationDao.java | 17
zq-erp/src/main/java/com/matrix/system/score/service/ScoreGoodsSkuService.java | 20
zq-erp/src/main/resources/mybatis/mapper/score/ScoreGoodsDao.xml | 47 +
/dev/null | 8
zq-erp/src/main/java/com/matrix/system/score/service/ScoreGoodsNavigationService.java | 20
zq-erp/src/main/java/com/matrix/system/score/action/ScoreOrderItemAction.java | 21
zq-erp/src/main/resources/mybatis/mapper/score/ScoreGoodsImageDao.xml | 35 +
zq-erp/src/main/java/com/matrix/system/score/entity/ScoreGoodsSku.java | 79 ++
zq-erp/src/main/java/com/matrix/system/score/service/ScoreUseRecordService.java | 20
zq-erp/src/main/java/com/matrix/system/score/dao/ScoreUseRecordDao.java | 17
58 files changed, 1,837 insertions(+), 109 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/score/action/ScoreGoodsAction.java b/zq-erp/src/main/java/com/matrix/system/score/action/ScoreGoodsAction.java
new file mode 100644
index 0000000..090d996
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/system/score/action/ScoreGoodsAction.java
@@ -0,0 +1,21 @@
+package com.matrix.system.score.action;
+
+import com.matrix.system.score.service.ScoreGoodsService;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @description 商品表
+ * @author yourName
+ * @date 2021-02-26 15:26
+ */
+@RestController
+@RequestMapping(value = "admin/scoreGoods")
+public class ScoreGoodsAction {
+
+ @Autowired
+ private ScoreGoodsService scoreGoodsService;
+
+
+}
\ No newline at end of file
diff --git a/zq-erp/src/main/java/com/matrix/system/score/action/ScoreGoodsCategoryAction.java b/zq-erp/src/main/java/com/matrix/system/score/action/ScoreGoodsCategoryAction.java
new file mode 100644
index 0000000..93b8c35
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/system/score/action/ScoreGoodsCategoryAction.java
@@ -0,0 +1,21 @@
+package com.matrix.system.score.action;
+
+import com.matrix.system.score.service.ScoreGoodsCategoryService;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @description 商品分类表
+ * @author yourName
+ * @date 2021-02-26 15:26
+ */
+@RestController
+@RequestMapping(value = "admin/scoreGoodsCategory")
+public class ScoreGoodsCategoryAction {
+
+ @Autowired
+ private ScoreGoodsCategoryService scoreGoodsCategoryService;
+
+
+}
\ No newline at end of file
diff --git a/zq-erp/src/main/java/com/matrix/system/score/action/ScoreGoodsImageAction.java b/zq-erp/src/main/java/com/matrix/system/score/action/ScoreGoodsImageAction.java
new file mode 100644
index 0000000..17adc55
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/system/score/action/ScoreGoodsImageAction.java
@@ -0,0 +1,21 @@
+package com.matrix.system.score.action;
+
+import com.matrix.system.score.service.ScoreGoodsImageService;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @description 商品图片表
+ * @author yourName
+ * @date 2021-02-26 15:26
+ */
+@RestController
+@RequestMapping(value = "admin/scoreGoodsImage")
+public class ScoreGoodsImageAction {
+
+ @Autowired
+ private ScoreGoodsImageService scoreGoodsImageService;
+
+
+}
\ No newline at end of file
diff --git a/zq-erp/src/main/java/com/matrix/system/score/action/ScoreGoodsNavigationAction.java b/zq-erp/src/main/java/com/matrix/system/score/action/ScoreGoodsNavigationAction.java
new file mode 100644
index 0000000..618e4a4
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/system/score/action/ScoreGoodsNavigationAction.java
@@ -0,0 +1,21 @@
+package com.matrix.system.score.action;
+
+import com.matrix.system.score.service.ScoreGoodsNavigationService;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @description 商品栏目表
+ * @author yourName
+ * @date 2021-02-26 15:26
+ */
+@RestController
+@RequestMapping(value = "admin/scoreGoodsNavigation")
+public class ScoreGoodsNavigationAction {
+
+ @Autowired
+ private ScoreGoodsNavigationService scoreGoodsNavigationService;
+
+
+}
\ No newline at end of file
diff --git a/zq-erp/src/main/java/com/matrix/system/score/action/ScoreGoodsSkuAction.java b/zq-erp/src/main/java/com/matrix/system/score/action/ScoreGoodsSkuAction.java
new file mode 100644
index 0000000..36beb91
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/system/score/action/ScoreGoodsSkuAction.java
@@ -0,0 +1,21 @@
+package com.matrix.system.score.action;
+
+import com.matrix.system.score.service.ScoreGoodsSkuService;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @description 商品规格表
+ * @author yourName
+ * @date 2021-02-26 15:26
+ */
+@RestController
+@RequestMapping(value = "admin/scoreGoodsSku")
+public class ScoreGoodsSkuAction {
+
+ @Autowired
+ private ScoreGoodsSkuService scoreGoodsSkuService;
+
+
+}
\ No newline at end of file
diff --git a/zq-erp/src/main/java/com/matrix/system/score/action/ScoreOrderAction.java b/zq-erp/src/main/java/com/matrix/system/score/action/ScoreOrderAction.java
new file mode 100644
index 0000000..bf18432
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/system/score/action/ScoreOrderAction.java
@@ -0,0 +1,21 @@
+package com.matrix.system.score.action;
+
+import com.matrix.system.score.service.ScoreOrderService;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @description 订单表
+ * @author yourName
+ * @date 2021-02-26 15:26
+ */
+@RestController
+@RequestMapping(value = "admin/scoreOrder")
+public class ScoreOrderAction {
+
+ @Autowired
+ private ScoreOrderService scoreOrderService;
+
+
+}
\ No newline at end of file
diff --git a/zq-erp/src/main/java/com/matrix/system/score/action/ScoreOrderItemAction.java b/zq-erp/src/main/java/com/matrix/system/score/action/ScoreOrderItemAction.java
new file mode 100644
index 0000000..1a7857d
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/system/score/action/ScoreOrderItemAction.java
@@ -0,0 +1,21 @@
+package com.matrix.system.score.action;
+
+import com.matrix.system.score.service.ScoreOrderItemService;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @description 订单详情表
+ * @author yourName
+ * @date 2021-02-26 15:26
+ */
+@RestController
+@RequestMapping(value = "admin/scoreOrderItem")
+public class ScoreOrderItemAction {
+
+ @Autowired
+ private ScoreOrderItemService scoreOrderItemService;
+
+
+}
\ No newline at end of file
diff --git a/zq-erp/src/main/java/com/matrix/system/score/action/ScoreRuleSettingAction.java b/zq-erp/src/main/java/com/matrix/system/score/action/ScoreRuleSettingAction.java
index 18f6519..9cb88db 100644
--- a/zq-erp/src/main/java/com/matrix/system/score/action/ScoreRuleSettingAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/score/action/ScoreRuleSettingAction.java
@@ -2,24 +2,15 @@
import com.matrix.core.constance.MatrixConstance;
import com.matrix.core.pojo.AjaxResult;
-import com.matrix.core.pojo.PaginationVO;
import com.matrix.core.tools.WebUtil;
import com.matrix.system.common.bean.BusParameterSettings;
import com.matrix.system.common.bean.SysUsers;
import com.matrix.system.common.dao.BusParameterSettingsDao;
-import com.matrix.system.constance.Dictionary;
-import com.matrix.system.hive.action.util.QueryUtil;
-import com.matrix.system.hive.bean.ParameterSettings;
-import com.matrix.system.hive.bean.SysProjUse;
import com.matrix.system.score.constant.ScoreSettingConstant;
-import com.matrix.system.score.service.ScoreOrderService;
-import com.matrix.system.score.vo.ScoreOrderVo;
+import com.matrix.system.score.service.ScoreRuleSettingService;
import com.matrix.system.score.vo.ScoreRuleSettingsVo;
-import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
-import io.swagger.annotations.Api;
-import net.sf.jsqlparser.util.AddAliasesVisitor;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -33,20 +24,19 @@
* @author wzy
* @date 2021-02-22
**/
-@Api(value = "积分订单", tags = "积分订单")
@RestController
@RequestMapping(value = "/score/ruleSetting")
public class ScoreRuleSettingAction {
@Autowired
- private ScoreOrderService scoreOrderService;
+ private ScoreRuleSettingService scoreRuleSettingService;
@Autowired
private BusParameterSettingsDao busParameterSettingsDao;
@GetMapping(value = "/testApi")
public AjaxResult testApi() {
- scoreOrderService.testMethod();
+ scoreRuleSettingService.testMethod();
return AjaxResult.buildSuccessInstance("success");
}
@@ -145,7 +135,7 @@
@PostMapping(value = "/updateScoreRule")
public @ResponseBody
AjaxResult updateScoreRule(@RequestBody List<BusParameterSettings> busParameterSettings) {
- return scoreOrderService.updateScoreRuleByCompanyId(busParameterSettings);
+ return scoreRuleSettingService.updateScoreRuleByCompanyId(busParameterSettings);
}
}
diff --git a/zq-erp/src/main/java/com/matrix/system/score/action/ScoreShoppingCarAction.java b/zq-erp/src/main/java/com/matrix/system/score/action/ScoreShoppingCarAction.java
new file mode 100644
index 0000000..ae07316
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/system/score/action/ScoreShoppingCarAction.java
@@ -0,0 +1,21 @@
+package com.matrix.system.score.action;
+
+import com.matrix.system.score.service.ScoreShoppingCarService;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @description 购物车
+ * @author yourName
+ * @date 2021-02-26 15:26
+ */
+@RestController
+@RequestMapping(value = "admin/scoreShoppingCar")
+public class ScoreShoppingCarAction {
+
+ @Autowired
+ private ScoreShoppingCarService scoreShoppingCarService;
+
+
+}
\ No newline at end of file
diff --git a/zq-erp/src/main/java/com/matrix/system/score/action/ScoreUseRecordAction.java b/zq-erp/src/main/java/com/matrix/system/score/action/ScoreUseRecordAction.java
new file mode 100644
index 0000000..29570eb
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/system/score/action/ScoreUseRecordAction.java
@@ -0,0 +1,21 @@
+package com.matrix.system.score.action;
+
+import com.matrix.system.score.service.ScoreUseRecordService;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @description 积分记录表
+ * @author yourName
+ * @date 2021-02-26 15:26
+ */
+@RestController
+@RequestMapping(value = "admin/scoreUseRecord")
+public class ScoreUseRecordAction {
+
+ @Autowired
+ private ScoreUseRecordService scoreUseRecordService;
+
+
+}
\ No newline at end of file
diff --git a/zq-erp/src/main/java/com/matrix/system/score/action/ScoreVipDetailAction.java b/zq-erp/src/main/java/com/matrix/system/score/action/ScoreVipDetailAction.java
new file mode 100644
index 0000000..944719e
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/system/score/action/ScoreVipDetailAction.java
@@ -0,0 +1,21 @@
+package com.matrix.system.score.action;
+
+import com.matrix.system.score.service.ScoreVipDetailService;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @description 客户积分余额
+ * @author yourName
+ * @date 2021-02-26 15:26
+ */
+@RestController
+@RequestMapping(value = "admin/scoreVipDetail")
+public class ScoreVipDetailAction {
+
+ @Autowired
+ private ScoreVipDetailService scoreVipDetailService;
+
+
+}
\ No newline at end of file
diff --git a/zq-erp/src/main/java/com/matrix/system/score/dao/ScoreGoodsCategoryDao.java b/zq-erp/src/main/java/com/matrix/system/score/dao/ScoreGoodsCategoryDao.java
new file mode 100644
index 0000000..ca488c3
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/system/score/dao/ScoreGoodsCategoryDao.java
@@ -0,0 +1,13 @@
+package com.matrix.system.score.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.matrix.system.score.entity.ScoreGoodsCategory;
+
+/**
+ * @description 商品分类表
+ * @author yourName
+ * @date 2021-02-26 15:26
+ */
+public interface ScoreGoodsCategoryDao extends BaseMapper<ScoreGoodsCategory> {
+
+}
\ No newline at end of file
diff --git a/zq-erp/src/main/java/com/matrix/system/score/dao/ScoreGoodsDao.java b/zq-erp/src/main/java/com/matrix/system/score/dao/ScoreGoodsDao.java
new file mode 100644
index 0000000..09ba2d6
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/system/score/dao/ScoreGoodsDao.java
@@ -0,0 +1,17 @@
+package com.matrix.system.score.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import java.util.List;
+import java.util.Map;
+import com.matrix.core.pojo.PaginationVO;
+import com.matrix.system.score.entity.ScoreGoods;
+
+/**
+ * @description 商品表
+ * @author yourName
+ * @date 2021-02-26 15:26
+ */
+public interface ScoreGoodsDao extends BaseMapper<ScoreGoods> {
+
+}
\ No newline at end of file
diff --git a/zq-erp/src/main/java/com/matrix/system/score/dao/ScoreGoodsImageDao.java b/zq-erp/src/main/java/com/matrix/system/score/dao/ScoreGoodsImageDao.java
new file mode 100644
index 0000000..563b81a
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/system/score/dao/ScoreGoodsImageDao.java
@@ -0,0 +1,17 @@
+package com.matrix.system.score.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import java.util.List;
+import java.util.Map;
+import com.matrix.core.pojo.PaginationVO;
+import com.matrix.system.score.entity.ScoreGoodsImage;
+
+/**
+ * @description 商品图片表
+ * @author yourName
+ * @date 2021-02-26 15:26
+ */
+public interface ScoreGoodsImageDao extends BaseMapper<ScoreGoodsImage> {
+
+}
\ No newline at end of file
diff --git a/zq-erp/src/main/java/com/matrix/system/score/dao/ScoreGoodsNavigationDao.java b/zq-erp/src/main/java/com/matrix/system/score/dao/ScoreGoodsNavigationDao.java
new file mode 100644
index 0000000..066d0a0
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/system/score/dao/ScoreGoodsNavigationDao.java
@@ -0,0 +1,17 @@
+package com.matrix.system.score.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import java.util.List;
+import java.util.Map;
+import com.matrix.core.pojo.PaginationVO;
+import com.matrix.system.score.entity.ScoreGoodsNavigation;
+
+/**
+ * @description 商品栏目表
+ * @author yourName
+ * @date 2021-02-26 15:26
+ */
+public interface ScoreGoodsNavigationDao extends BaseMapper<ScoreGoodsNavigation> {
+
+}
\ No newline at end of file
diff --git a/zq-erp/src/main/java/com/matrix/system/score/dao/ScoreGoodsSkuDao.java b/zq-erp/src/main/java/com/matrix/system/score/dao/ScoreGoodsSkuDao.java
new file mode 100644
index 0000000..bad2f10
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/system/score/dao/ScoreGoodsSkuDao.java
@@ -0,0 +1,17 @@
+package com.matrix.system.score.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import java.util.List;
+import java.util.Map;
+import com.matrix.core.pojo.PaginationVO;
+import com.matrix.system.score.entity.ScoreGoodsSku;
+
+/**
+ * @description 商品规格表
+ * @author yourName
+ * @date 2021-02-26 15:26
+ */
+public interface ScoreGoodsSkuDao extends BaseMapper<ScoreGoodsSku> {
+
+}
\ No newline at end of file
diff --git a/zq-erp/src/main/java/com/matrix/system/score/dao/ScoreOrderDao.java b/zq-erp/src/main/java/com/matrix/system/score/dao/ScoreOrderDao.java
index 1fb5d04..3ed1af5 100644
--- a/zq-erp/src/main/java/com/matrix/system/score/dao/ScoreOrderDao.java
+++ b/zq-erp/src/main/java/com/matrix/system/score/dao/ScoreOrderDao.java
@@ -1,11 +1,17 @@
-package com.matrix.system.score.dao;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.matrix.system.score.entity.ScoreOrderEntity;
-
-/**
- * @author wzy
- * @date 2021-02-22
- **/
-public interface ScoreOrderDao extends BaseMapper<ScoreOrderEntity> {
-}
+package com.matrix.system.score.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import java.util.List;
+import java.util.Map;
+import com.matrix.core.pojo.PaginationVO;
+import com.matrix.system.score.entity.ScoreOrder;
+
+/**
+ * @description 订单表
+ * @author yourName
+ * @date 2021-02-26 15:26
+ */
+public interface ScoreOrderDao extends BaseMapper<ScoreOrder> {
+
+}
\ No newline at end of file
diff --git a/zq-erp/src/main/java/com/matrix/system/score/dao/ScoreOrderItemDao.java b/zq-erp/src/main/java/com/matrix/system/score/dao/ScoreOrderItemDao.java
new file mode 100644
index 0000000..dff6179
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/system/score/dao/ScoreOrderItemDao.java
@@ -0,0 +1,17 @@
+package com.matrix.system.score.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import java.util.List;
+import java.util.Map;
+import com.matrix.core.pojo.PaginationVO;
+import com.matrix.system.score.entity.ScoreOrderItem;
+
+/**
+ * @description 订单详情表
+ * @author yourName
+ * @date 2021-02-26 15:26
+ */
+public interface ScoreOrderItemDao extends BaseMapper<ScoreOrderItem> {
+
+}
\ No newline at end of file
diff --git a/zq-erp/src/main/java/com/matrix/system/score/dao/ScoreRuleSettingDao.java b/zq-erp/src/main/java/com/matrix/system/score/dao/ScoreRuleSettingDao.java
new file mode 100644
index 0000000..9bfc095
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/system/score/dao/ScoreRuleSettingDao.java
@@ -0,0 +1,11 @@
+package com.matrix.system.score.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.matrix.system.score.entity.ScoreRuleSettingEntity;
+
+/**
+ * @author wzy
+ * @date 2021-02-22
+ **/
+public interface ScoreRuleSettingDao extends BaseMapper<ScoreRuleSettingEntity> {
+}
diff --git a/zq-erp/src/main/java/com/matrix/system/score/dao/ScoreShoppingCarDao.java b/zq-erp/src/main/java/com/matrix/system/score/dao/ScoreShoppingCarDao.java
new file mode 100644
index 0000000..9ee8b89
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/system/score/dao/ScoreShoppingCarDao.java
@@ -0,0 +1,17 @@
+package com.matrix.system.score.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import java.util.List;
+import java.util.Map;
+import com.matrix.core.pojo.PaginationVO;
+import com.matrix.system.score.entity.ScoreShoppingCar;
+
+/**
+ * @description 购物车
+ * @author yourName
+ * @date 2021-02-26 15:26
+ */
+public interface ScoreShoppingCarDao extends BaseMapper<ScoreShoppingCar> {
+
+}
\ No newline at end of file
diff --git a/zq-erp/src/main/java/com/matrix/system/score/dao/ScoreUseRecordDao.java b/zq-erp/src/main/java/com/matrix/system/score/dao/ScoreUseRecordDao.java
new file mode 100644
index 0000000..148e98e
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/system/score/dao/ScoreUseRecordDao.java
@@ -0,0 +1,17 @@
+package com.matrix.system.score.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import java.util.List;
+import java.util.Map;
+import com.matrix.core.pojo.PaginationVO;
+import com.matrix.system.score.entity.ScoreUseRecord;
+
+/**
+ * @description 积分记录表
+ * @author yourName
+ * @date 2021-02-26 15:26
+ */
+public interface ScoreUseRecordDao extends BaseMapper<ScoreUseRecord> {
+
+}
\ No newline at end of file
diff --git a/zq-erp/src/main/java/com/matrix/system/score/dao/ScoreVipDetailDao.java b/zq-erp/src/main/java/com/matrix/system/score/dao/ScoreVipDetailDao.java
new file mode 100644
index 0000000..cd7b100
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/system/score/dao/ScoreVipDetailDao.java
@@ -0,0 +1,17 @@
+package com.matrix.system.score.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import java.util.List;
+import java.util.Map;
+import com.matrix.core.pojo.PaginationVO;
+import com.matrix.system.score.entity.ScoreVipDetail;
+
+/**
+ * @description 客户积分余额
+ * @author yourName
+ * @date 2021-02-26 15:26
+ */
+public interface ScoreVipDetailDao extends BaseMapper<ScoreVipDetail> {
+
+}
\ No newline at end of file
diff --git a/zq-erp/src/main/java/com/matrix/system/score/dto/ScoreOrderDto.java b/zq-erp/src/main/java/com/matrix/system/score/dto/ScoreRuleSettingDto.java
similarity index 70%
rename from zq-erp/src/main/java/com/matrix/system/score/dto/ScoreOrderDto.java
rename to zq-erp/src/main/java/com/matrix/system/score/dto/ScoreRuleSettingDto.java
index 353b216..0b31eff 100644
--- a/zq-erp/src/main/java/com/matrix/system/score/dto/ScoreOrderDto.java
+++ b/zq-erp/src/main/java/com/matrix/system/score/dto/ScoreRuleSettingDto.java
@@ -4,5 +4,5 @@
* @author wzy
* @date 2021-02-22
**/
-public class ScoreOrderDto {
+public class ScoreRuleSettingDto {
}
diff --git a/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreGoods.java b/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreGoods.java
new file mode 100644
index 0000000..e6fe507
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreGoods.java
@@ -0,0 +1,103 @@
+package com.matrix.system.score.entity;
+
+import com.matrix.core.anotations.Extend;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import lombok.Data;
+
+/**
+ * @description 商品表
+ * @author yourName
+ * @date 2021-02-26 15:26
+ */
+@Data
+@TableName("score_goods")
+public class ScoreGoods extends BaseEntity{
+ @Extend
+ private static final long serialVersionUID = 1L;
+
+
+
+
+
+ /**
+ * 商品名称
+ */
+
+
+ private String goodsName;
+
+ /**
+ * 商品编码
+ */
+
+
+ private String goodsCode;
+
+ /**
+ * 商品分类ID
+ */
+
+
+ private Long categoryId;
+
+ /**
+ * 上架状态（1：不上架 2：上架）
+ */
+
+
+ private Integer state;
+
+ /**
+ * 限购数量（设置为限购数量 不设置则表示不限购）
+ */
+
+
+ private Integer limitedNum;
+
+ /**
+ * 所需积分（单价）
+ */
+
+
+ private Integer scorePrice;
+
+ /**
+ * 市场价
+ */
+
+
+ private String markPrice;
+
+ /**
+ * 商品详情
+ */
+
+
+ private String details;
+
+ /**
+ * 推荐到栏目
+ */
+
+
+ private Long navigationId;
+
+ /**
+ * 备注
+ */
+
+
+ private String remarks;
+
+ /**
+ * 所属公司ID
+ */
+
+
+ private Long companyId;
+
+
+
+
+}
\ No newline at end of file
diff --git a/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreGoodsCategory.java b/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreGoodsCategory.java
new file mode 100644
index 0000000..557b112
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreGoodsCategory.java
@@ -0,0 +1,54 @@
+package com.matrix.system.score.entity;
+
+import com.matrix.core.anotations.Extend;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import lombok.Data;
+
+/**
+ * @description 商品分类表
+ * @author yourName
+ * @date 2021-02-26 15:26
+ */
+@Data
+@TableName("score_goods_category")
+public class ScoreGoodsCategory extends BaseEntity{
+ @Extend
+ private static final long serialVersionUID = 1L;
+
+
+
+
+
+ /**
+ * 父级id
+ */
+
+
+ private Long parentId;
+
+ /**
+ * 名称
+ */
+
+
+ private String cateName;
+
+ /**
+ * 编码
+ */
+
+
+ private String cateCode;
+
+ /**
+ * 所属公司_id
+ */
+
+
+ private Long companyId;
+
+
+
+
+}
\ No newline at end of file
diff --git a/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreGoodsImage.java b/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreGoodsImage.java
new file mode 100644
index 0000000..d31b5b5
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreGoodsImage.java
@@ -0,0 +1,61 @@
+package com.matrix.system.score.entity;
+
+import com.matrix.core.anotations.Extend;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import lombok.Data;
+
+/**
+ * @description 商品图片表
+ * @author yourName
+ * @date 2021-02-26 15:26
+ */
+@Data
+@TableName("score_goods_image")
+public class ScoreGoodsImage extends BaseEntity{
+ @Extend
+ private static final long serialVersionUID = 1L;
+
+
+
+
+
+ /**
+ * 地址
+ */
+
+
+ private String imgPath;
+
+ /**
+ * 缩略图显示图片(1:缩略图图片)
+ */
+
+
+ private Integer imgMain;
+
+ /**
+ * 排序
+ */
+
+
+ private Integer imgSort;
+
+ /**
+ * 商品ID
+ */
+
+
+ private Long goodsId;
+
+ /**
+ * 所属公司_id
+ */
+
+
+ private Long companyId;
+
+
+
+
+}
\ No newline at end of file
diff --git a/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreGoodsNavigation.java b/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreGoodsNavigation.java
new file mode 100644
index 0000000..a430eff
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreGoodsNavigation.java
@@ -0,0 +1,47 @@
+package com.matrix.system.score.entity;
+
+import com.matrix.core.anotations.Extend;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import lombok.Data;
+
+/**
+ * @description 商品栏目表
+ * @author yourName
+ * @date 2021-02-26 15:26
+ */
+@Data
+@TableName("score_goods_navigation")
+public class ScoreGoodsNavigation extends BaseEntity{
+ @Extend
+ private static final long serialVersionUID = 1L;
+
+
+
+
+
+ /**
+ * 名称
+ */
+
+
+ private String naviName;
+
+ /**
+ * 编码
+ */
+
+
+ private String naviCode;
+
+ /**
+ * 所属公司_id
+ */
+
+
+ private Long companyId;
+
+
+
+
+}
\ No newline at end of file
diff --git a/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreGoodsSku.java b/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreGoodsSku.java
new file mode 100644
index 0000000..abf01b3
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreGoodsSku.java
@@ -0,0 +1,79 @@
+package com.matrix.system.score.entity;
+
+import com.matrix.core.anotations.Extend;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import lombok.Data;
+
+/**
+ * @description 商品规格表
+ * @author yourName
+ * @date 2021-02-26 15:26
+ */
+@Data
+@TableName("score_goods_sku")
+public class ScoreGoodsSku extends BaseEntity{
+ @Extend
+ private static final long serialVersionUID = 1L;
+
+
+ /**
+ * 名称
+ */
+
+
+ private String skuName;
+
+ /**
+ * 图片
+ */
+
+
+ private Long imgPath;
+
+ /**
+ * 抵扣所需积分
+ */
+
+
+ private Integer scorePrice;
+
+ /**
+ * 库存
+ */
+
+
+ private Integer reserve;
+
+ /**
+ * 排序
+ */
+
+
+ private Integer skuSort;
+
+ /**
+ * 商品ID
+ */
+
+
+ private Long goodsId;
+
+ /**
+ * 关联ERP产品code
+ */
+
+
+ private String skuErpCode;
+
+ /**
+ * 所属公司_id
+ */
+
+
+ private Long companyId;
+
+
+
+
+}
\ No newline at end of file
diff --git a/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreOrder.java b/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreOrder.java
new file mode 100644
index 0000000..82472b7
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreOrder.java
@@ -0,0 +1,126 @@
+package com.matrix.system.score.entity;
+
+import com.matrix.core.anotations.Extend;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @description 订单表
+ * @author yourName
+ * @date 2021-02-26 15:26
+ */
+@Data
+@TableName("score_goods_order")
+public class ScoreOrder extends BaseEntity{
+ @Extend
+ private static final long serialVersionUID = 1L;
+
+
+
+
+
+ /**
+ * 订单编号
+ */
+
+
+ private String orderCode;
+
+ /**
+ * 会员ID(openID)
+ */
+
+
+ private String memberId;
+
+ /**
+ * 联系方式
+ */
+
+
+ private String memberPhone;
+
+ /**
+ * 支付总积分
+ */
+
+
+ private Integer payTotalScore;
+
+ /**
+ * 订单状态（1：待支付2：待配送3：待收货4：已收货）
+ */
+
+
+ private Integer orderState;
+
+ /**
+ * 下单时间
+ */
+
+
+ private Date orderTime;
+
+ /**
+ * 支付时间
+ */
+
+
+ private Date payTime;
+
+ /**
+ * 收货方式(1物流2自提)
+ */
+
+
+ private Integer receiveWay;
+
+ /**
+ * 收货地址ID
+ */
+
+
+ private Long addressId;
+
+ /**
+ * 自提门店地址
+ */
+
+
+ private String selfAddress;
+
+ /**
+ * 自提时间
+ */
+
+
+ private Date selfTime;
+
+ /**
+ * 物流ID
+ */
+
+
+ private Long logisticsId;
+
+ /**
+ * 备注
+ */
+
+
+ private String remarks;
+
+ /**
+ * 所属公司_ID
+ */
+
+
+ private Long companyId;
+
+
+
+
+}
\ No newline at end of file
diff --git a/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreOrderItem.java b/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreOrderItem.java
new file mode 100644
index 0000000..aaa990f
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreOrderItem.java
@@ -0,0 +1,75 @@
+package com.matrix.system.score.entity;
+
+import com.matrix.core.anotations.Extend;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import lombok.Data;
+
+/**
+ * @description 订单详情表
+ * @author yourName
+ * @date 2021-02-26 15:26
+ */
+@Data
+@TableName("score_order_item")
+public class ScoreOrderItem extends BaseEntity{
+ @Extend
+ private static final long serialVersionUID = 1L;
+
+
+
+
+
+ /**
+ * 商品id
+ */
+
+
+ private Long goodsId;
+
+ /**
+ * 商品名称
+ */
+
+
+ private String goodsName;
+
+ /**
+ * 商品编码
+ */
+
+
+ private String goodsCode;
+
+ /**
+ * 数量
+ */
+
+
+ private Integer goodsNum;
+
+ /**
+ * 支付积分
+ */
+
+
+ private Integer payScore;
+
+ /**
+ * 订单ID
+ */
+
+
+ private Long orderId;
+
+ /**
+ * 所属公司_id
+ */
+
+
+ private Long companyId;
+
+
+
+
+}
\ No newline at end of file
diff --git a/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreOrderEntity.java b/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreRuleSettingEntity.java
similarity index 85%
rename from zq-erp/src/main/java/com/matrix/system/score/entity/ScoreOrderEntity.java
rename to zq-erp/src/main/java/com/matrix/system/score/entity/ScoreRuleSettingEntity.java
index bf7884c..5ba55b1 100644
--- a/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreOrderEntity.java
+++ b/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreRuleSettingEntity.java
@@ -7,7 +7,7 @@
* @date 2021-02-22
**/
@TableName("score_order")
-public class ScoreOrderEntity extends BaseEntity {
+public class ScoreRuleSettingEntity extends BaseEntity {
private String orderNo;
diff --git a/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreShoppingCar.java b/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreShoppingCar.java
new file mode 100644
index 0000000..dca1e08
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreShoppingCar.java
@@ -0,0 +1,54 @@
+package com.matrix.system.score.entity;
+
+import com.matrix.core.anotations.Extend;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import lombok.Data;
+
+/**
+ * @description 购物车
+ * @author yourName
+ * @date 2021-02-26 15:26
+ */
+@Data
+@TableName("score_shopping_car")
+public class ScoreShoppingCar extends BaseEntity{
+ @Extend
+ private static final long serialVersionUID = 1L;
+
+
+
+
+
+ /**
+ * 会员ID(openID)
+ */
+
+
+ private String userId;
+
+ /**
+ * 商品id
+ */
+
+
+ private Long goodsId;
+
+ /**
+ * 数量
+ */
+
+
+ private Integer count;
+
+ /**
+ * 所属公司_id
+ */
+
+
+ private Long companyId;
+
+
+
+
+}
\ No newline at end of file
diff --git a/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreUseRecord.java b/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreUseRecord.java
new file mode 100644
index 0000000..4d6a630
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreUseRecord.java
@@ -0,0 +1,89 @@
+package com.matrix.system.score.entity;
+
+import com.matrix.core.anotations.Extend;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import lombok.Data;
+
+/**
+ * @description 积分记录表
+ * @author yourName
+ * @date 2021-02-26 15:26
+ */
+@Data
+@TableName("score_use_record")
+public class ScoreUseRecord extends BaseEntity{
+ @Extend
+ private static final long serialVersionUID = 1L;
+
+
+
+
+
+ /**
+ * 记录类型(1：现金消费2：员工划扣3赠送等)
+ */
+
+
+ private Integer recType;
+
+ /**
+ * 数量
+ */
+
+
+ private Integer recNum;
+
+ /**
+ * 业务记录ID
+ */
+
+
+ private Long businessId;
+
+ /**
+ * 积分卡ID
+ */
+
+
+ private Long scoreVipDetailId;
+
+ /**
+ * 原积分
+ */
+
+
+ private Integer preScore;
+
+ /**
+ * 现积分
+ */
+
+
+ private Integer nowScore;
+
+ /**
+ * 操作人ID
+ */
+
+
+ private Long userId;
+
+ /**
+ * 备注
+ */
+
+
+ private String remarks;
+
+ /**
+ * 所属公司_id
+ */
+
+
+ private Long companyId;
+
+
+
+
+}
\ No newline at end of file
diff --git a/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreVipDetail.java b/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreVipDetail.java
new file mode 100644
index 0000000..aa2f2c8
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreVipDetail.java
@@ -0,0 +1,91 @@
+package com.matrix.system.score.entity;
+
+import com.matrix.core.anotations.Extend;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @description 客户积分余额
+ * @author yourName
+ * @date 2021-02-26 15:26
+ */
+@Data
+@TableName("score_vip_detail")
+public class ScoreVipDetail extends BaseEntity{
+ @Extend
+ private static final long serialVersionUID = 1L;
+
+
+
+
+
+ /**
+ * 获取类型(1：现金消费2：赠送等)
+ */
+
+
+ private Integer type;
+
+ /**
+ * 积分总数
+ */
+
+
+ private Integer allScore;
+
+ /**
+ * 已使用积分
+ */
+
+
+ private Integer usedScore;
+
+ /**
+ * 剩余积分
+ */
+
+
+ private Integer remainScore;
+
+ /**
+ * 获取时间
+ */
+
+
+ private Date gainTime;
+
+ /**
+ * 到期时间
+ */
+
+
+ private Date validiteTime;
+
+ /**
+ * 有效状态（1：有效 2：无效）
+ */
+
+
+ private Integer state;
+
+ /**
+ * 原始单据ID
+ */
+
+
+ private String businessId;
+
+ /**
+ * 所属公司_id
+ */
+
+
+ private Long companyId;
+
+
+
+
+}
\ No newline at end of file
diff --git a/zq-erp/src/main/java/com/matrix/system/score/mapper/ScoreOrderMapper.java b/zq-erp/src/main/java/com/matrix/system/score/mapper/ScoreRuleSettingMapper.java
similarity index 69%
rename from zq-erp/src/main/java/com/matrix/system/score/mapper/ScoreOrderMapper.java
rename to zq-erp/src/main/java/com/matrix/system/score/mapper/ScoreRuleSettingMapper.java
index eade724..deb3e80 100644
--- a/zq-erp/src/main/java/com/matrix/system/score/mapper/ScoreOrderMapper.java
+++ b/zq-erp/src/main/java/com/matrix/system/score/mapper/ScoreRuleSettingMapper.java
@@ -4,5 +4,5 @@
* @author wzy
* @date 2021-02-22
**/
-public class ScoreOrderMapper {
+public class ScoreRuleSettingMapper {
}
diff --git a/zq-erp/src/main/java/com/matrix/system/score/service/ScoreGoodsCategoryService.java b/zq-erp/src/main/java/com/matrix/system/score/service/ScoreGoodsCategoryService.java
new file mode 100644
index 0000000..ccfe942
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/system/score/service/ScoreGoodsCategoryService.java
@@ -0,0 +1,20 @@
+package com.matrix.system.score.service;
+
+import com.matrix.system.score.dao.ScoreGoodsCategoryDao;
+import com.matrix.system.score.entity.ScoreGoodsCategory;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * @description 商品分类表
+ * @author yourName
+ * @date 2021-02-26 15:26
+ */
+@Service
+public class ScoreGoodsCategoryService extends ServiceImpl<ScoreGoodsCategoryDao, ScoreGoodsCategory>{
+
+
+
+
+
+}
\ No newline at end of file
diff --git a/zq-erp/src/main/java/com/matrix/system/score/service/ScoreGoodsImageService.java b/zq-erp/src/main/java/com/matrix/system/score/service/ScoreGoodsImageService.java
new file mode 100644
index 0000000..087463e
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/system/score/service/ScoreGoodsImageService.java
@@ -0,0 +1,20 @@
+package com.matrix.system.score.service;
+
+import com.matrix.system.score.dao.ScoreGoodsImageDao;
+import com.matrix.system.score.entity.ScoreGoodsImage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * @description 商品图片表
+ * @author yourName
+ * @date 2021-02-26 15:26
+ */
+@Service
+public class ScoreGoodsImageService extends ServiceImpl<ScoreGoodsImageDao, ScoreGoodsImage>{
+
+
+
+
+
+}
\ No newline at end of file
diff --git a/zq-erp/src/main/java/com/matrix/system/score/service/ScoreGoodsNavigationService.java b/zq-erp/src/main/java/com/matrix/system/score/service/ScoreGoodsNavigationService.java
new file mode 100644
index 0000000..f15e41d
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/system/score/service/ScoreGoodsNavigationService.java
@@ -0,0 +1,20 @@
+package com.matrix.system.score.service;
+
+import com.matrix.system.score.dao.ScoreGoodsNavigationDao;
+import com.matrix.system.score.entity.ScoreGoodsNavigation;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * @description 商品栏目表
+ * @author yourName
+ * @date 2021-02-26 15:26
+ */
+@Service
+public class ScoreGoodsNavigationService extends ServiceImpl<ScoreGoodsNavigationDao, ScoreGoodsNavigation>{
+
+
+
+
+
+}
\ No newline at end of file
diff --git a/zq-erp/src/main/java/com/matrix/system/score/service/ScoreGoodsService.java b/zq-erp/src/main/java/com/matrix/system/score/service/ScoreGoodsService.java
new file mode 100644
index 0000000..55f3f99
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/system/score/service/ScoreGoodsService.java
@@ -0,0 +1,20 @@
+package com.matrix.system.score.service;
+
+import com.matrix.system.score.dao.ScoreGoodsDao;
+import com.matrix.system.score.entity.ScoreGoods;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * @description 商品表
+ * @author yourName
+ * @date 2021-02-26 15:26
+ */
+@Service
+public class ScoreGoodsService extends ServiceImpl<ScoreGoodsDao, ScoreGoods>{
+
+
+
+
+
+}
\ No newline at end of file
diff --git a/zq-erp/src/main/java/com/matrix/system/score/service/ScoreGoodsSkuService.java b/zq-erp/src/main/java/com/matrix/system/score/service/ScoreGoodsSkuService.java
new file mode 100644
index 0000000..487971c
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/system/score/service/ScoreGoodsSkuService.java
@@ -0,0 +1,20 @@
+package com.matrix.system.score.service;
+
+import com.matrix.system.score.dao.ScoreGoodsSkuDao;
+import com.matrix.system.score.entity.ScoreGoodsSku;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * @description 商品规格表
+ * @author yourName
+ * @date 2021-02-26 15:26
+ */
+@Service
+public class ScoreGoodsSkuService extends ServiceImpl<ScoreGoodsSkuDao, ScoreGoodsSku>{
+
+
+
+
+
+}
\ No newline at end of file
diff --git a/zq-erp/src/main/java/com/matrix/system/score/service/ScoreOrderItemService.java b/zq-erp/src/main/java/com/matrix/system/score/service/ScoreOrderItemService.java
new file mode 100644
index 0000000..a0abb54
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/system/score/service/ScoreOrderItemService.java
@@ -0,0 +1,20 @@
+package com.matrix.system.score.service;
+
+import com.matrix.system.score.dao.ScoreOrderItemDao;
+import com.matrix.system.score.entity.ScoreOrderItem;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * @description 订单详情表
+ * @author yourName
+ * @date 2021-02-26 15:26
+ */
+@Service
+public class ScoreOrderItemService extends ServiceImpl<ScoreOrderItemDao, ScoreOrderItem>{
+
+
+
+
+
+}
\ No newline at end of file
diff --git a/zq-erp/src/main/java/com/matrix/system/score/service/ScoreOrderService.java b/zq-erp/src/main/java/com/matrix/system/score/service/ScoreOrderService.java
index 37b06e0..6a105fb 100644
--- a/zq-erp/src/main/java/com/matrix/system/score/service/ScoreOrderService.java
+++ b/zq-erp/src/main/java/com/matrix/system/score/service/ScoreOrderService.java
@@ -1,72 +1,20 @@
-package com.matrix.system.score.service;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.StrUtil;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.matrix.core.constance.MatrixConstance;
-import com.matrix.core.pojo.AjaxResult;
-import com.matrix.core.pojo.PaginationVO;
-import com.matrix.core.tools.StringUtils;
-import com.matrix.core.tools.WebUtil;
-import com.matrix.system.common.bean.BusParameterSettings;
-import com.matrix.system.common.bean.SysUsers;
-import com.matrix.system.common.dao.BusParameterSettingsDao;
-import com.matrix.system.hive.bean.ParameterSettings;
-import com.matrix.system.hive.dao.SysVipInfoDao;
-import com.matrix.system.score.constant.ScoreSettingConstant;
-import com.matrix.system.score.dao.ScoreOrderDao;
-import com.matrix.system.score.entity.ScoreOrderEntity;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author wzy
- * @date 2021-02-22
- **/
-@Service
-public class ScoreOrderService extends ServiceImpl<ScoreOrderDao, ScoreOrderEntity> {
-
- @Autowired
- private ScoreOrderDao scoreOrderDao;
- @Autowired
- private BusParameterSettingsDao busParameterSettingsDao;
- @Autowired
- private SysVipInfoDao sysVipInfoDao;
-
- public void testMethod() {
- scoreOrderDao.selectById(1L);
- }
-
- public AjaxResult updateScoreRuleByCompanyId(List<BusParameterSettings> busParameterSettings) {
- //获取当前登录人员信息
- SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
- for (BusParameterSettings busParameterSetting:busParameterSettings ) {
- String paramCode = busParameterSetting.getParamCode();
- if(StringUtils.isNotBlank(paramCode)){
- //删除原有code
- BusParameterSettings delParanm=new BusParameterSettings();
- delParanm.setCompanyId(user.getCompanyId());
- delParanm.setParamCode(paramCode);
- busParameterSettingsDao.deleteByModel(delParanm);
- //添加新的code
- BusParameterSettings newParam=new BusParameterSettings();
- newParam.setParamCode(paramCode);
- newParam.setCompanyId(user.getCompanyId());
- newParam.setParamValue(busParameterSetting.getParamValue());
- newParam.setParamValue1(busParameterSetting.getParamValue1());
- newParam.setParamValue2(busParameterSetting.getParamValue2());
- busParameterSettingsDao.insert(newParam);
- }else{
- return AjaxResult.buildFailInstance("code不能为空");
- }
- }
- AjaxResult result = new AjaxResult(AjaxResult.STATUS_SUCCESS, "更新成功");
- return result;
- }
-
-}
+package com.matrix.system.score.service;
+
+import com.matrix.system.score.dao.ScoreOrderDao;
+import com.matrix.system.score.entity.ScoreOrder;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * @description 订单表
+ * @author yourName
+ * @date 2021-02-26 15:26
+ */
+@Service
+public class ScoreOrderService extends ServiceImpl<ScoreOrderDao, ScoreOrder>{
+
+
+
+
+
+}
\ No newline at end of file
diff --git a/zq-erp/src/main/java/com/matrix/system/score/service/ScoreRuleSettingService.java b/zq-erp/src/main/java/com/matrix/system/score/service/ScoreRuleSettingService.java
new file mode 100644
index 0000000..b2a65ff
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/system/score/service/ScoreRuleSettingService.java
@@ -0,0 +1,65 @@
+package com.matrix.system.score.service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.matrix.core.constance.MatrixConstance;
+import com.matrix.core.pojo.AjaxResult;
+import com.matrix.core.tools.StringUtils;
+import com.matrix.core.tools.WebUtil;
+import com.matrix.system.common.bean.BusParameterSettings;
+import com.matrix.system.common.bean.SysUsers;
+import com.matrix.system.common.dao.BusParameterSettingsDao;
+import com.matrix.system.hive.dao.SysVipInfoDao;
+import com.matrix.system.score.dao.ScoreRuleSettingDao;
+import com.matrix.system.score.entity.ScoreRuleSettingEntity;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author wzy
+ * @date 2021-02-22
+ **/
+@Service
+public class ScoreRuleSettingService extends ServiceImpl<ScoreRuleSettingDao, ScoreRuleSettingEntity> {
+
+ @Autowired
+ private ScoreRuleSettingDao scoreRuleSettingDao;
+ @Autowired
+ private BusParameterSettingsDao busParameterSettingsDao;
+ @Autowired
+ private SysVipInfoDao sysVipInfoDao;
+
+ public void testMethod() {
+ scoreRuleSettingDao.selectById(1L);
+ }
+
+ public AjaxResult updateScoreRuleByCompanyId(List<BusParameterSettings> busParameterSettings) {
+ //获取当前登录人员信息
+ SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
+ for (BusParameterSettings busParameterSetting:busParameterSettings ) {
+ String paramCode = busParameterSetting.getParamCode();
+ if(StringUtils.isNotBlank(paramCode)){
+ //删除原有code
+ BusParameterSettings delParanm=new BusParameterSettings();
+ delParanm.setCompanyId(user.getCompanyId());
+ delParanm.setParamCode(paramCode);
+ busParameterSettingsDao.deleteByModel(delParanm);
+ //添加新的code
+ BusParameterSettings newParam=new BusParameterSettings();
+ newParam.setParamCode(paramCode);
+ newParam.setCompanyId(user.getCompanyId());
+ newParam.setParamValue(busParameterSetting.getParamValue());
+ newParam.setParamValue1(busParameterSetting.getParamValue1());
+ newParam.setParamValue2(busParameterSetting.getParamValue2());
+ busParameterSettingsDao.insert(newParam);
+ }else{
+ return AjaxResult.buildFailInstance("code不能为空");
+ }
+ }
+ AjaxResult result = new AjaxResult(AjaxResult.STATUS_SUCCESS, "更新成功");
+ return result;
+ }
+
+}
diff --git a/zq-erp/src/main/java/com/matrix/system/score/service/ScoreShoppingCarService.java b/zq-erp/src/main/java/com/matrix/system/score/service/ScoreShoppingCarService.java
new file mode 100644
index 0000000..ebedf83
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/system/score/service/ScoreShoppingCarService.java
@@ -0,0 +1,20 @@
+package com.matrix.system.score.service;
+
+import com.matrix.system.score.dao.ScoreShoppingCarDao;
+import com.matrix.system.score.entity.ScoreShoppingCar;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * @description 购物车
+ * @author yourName
+ * @date 2021-02-26 15:26
+ */
+@Service
+public class ScoreShoppingCarService extends ServiceImpl<ScoreShoppingCarDao, ScoreShoppingCar>{
+
+
+
+
+
+}
\ No newline at end of file
diff --git a/zq-erp/src/main/java/com/matrix/system/score/service/ScoreUseRecordService.java b/zq-erp/src/main/java/com/matrix/system/score/service/ScoreUseRecordService.java
new file mode 100644
index 0000000..5c283a4
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/system/score/service/ScoreUseRecordService.java
@@ -0,0 +1,20 @@
+package com.matrix.system.score.service;
+
+import com.matrix.system.score.dao.ScoreUseRecordDao;
+import com.matrix.system.score.entity.ScoreUseRecord;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * @description 积分记录表
+ * @author yourName
+ * @date 2021-02-26 15:26
+ */
+@Service
+public class ScoreUseRecordService extends ServiceImpl<ScoreUseRecordDao, ScoreUseRecord>{
+
+
+
+
+
+}
\ No newline at end of file
diff --git a/zq-erp/src/main/java/com/matrix/system/score/service/ScoreVipDetailService.java b/zq-erp/src/main/java/com/matrix/system/score/service/ScoreVipDetailService.java
new file mode 100644
index 0000000..44ea832
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/system/score/service/ScoreVipDetailService.java
@@ -0,0 +1,20 @@
+package com.matrix.system.score.service;
+
+import com.matrix.system.score.dao.ScoreVipDetailDao;
+import com.matrix.system.score.entity.ScoreVipDetail;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * @description 客户积分余额
+ * @author yourName
+ * @date 2021-02-26 15:26
+ */
+@Service
+public class ScoreVipDetailService extends ServiceImpl<ScoreVipDetailDao, ScoreVipDetail>{
+
+
+
+
+
+}
\ No newline at end of file
diff --git a/zq-erp/src/main/java/com/matrix/system/score/vo/ScoreOrderVo.java b/zq-erp/src/main/java/com/matrix/system/score/vo/ScoreOrderVo.java
deleted file mode 100644
index 2de7909..0000000
--- a/zq-erp/src/main/java/com/matrix/system/score/vo/ScoreOrderVo.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.matrix.system.score.vo;
-
-/**
- * @author wzy
- * @date 2021-02-22
- **/
-public class ScoreOrderVo {
-}
diff --git a/zq-erp/src/main/resources/mybatis/mapper/score/ScoreGoodsCategoryDao.xml b/zq-erp/src/main/resources/mybatis/mapper/score/ScoreGoodsCategoryDao.xml
new file mode 100644
index 0000000..9b12242
--- /dev/null
+++ b/zq-erp/src/main/resources/mybatis/mapper/score/ScoreGoodsCategoryDao.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.matrix.system.score.dao.ScoreGoodsCategoryDao">
+ <!-- 定义ScoreGoodsCategory 的复杂关联map -->
+ <resultMap type="com.matrix.system.score.entity.ScoreGoodsCategory" id="ScoreGoodsCategoryMap">
+ <id property="id" column="id" />
+ <result property="createBy" column="create_by" />
+ <result property="createTime" column="create_time" />
+ <result property="updateBy" column="update_by" />
+ <result property="updateTime" column="update_time" />
+ <result property="parentId" column="parent_id" />
+ <result property="cateName" column="cate_name" />
+ <result property="cateCode" column="cate_code" />
+ <result property="companyId" column="company_id" />
+ </resultMap>
+
+
+ <!-- 定义ScoreGoodsCategory 的简单map ，本map不添加其他的关联属性 -->
+ <resultMap type="com.matrix.system.score.entity.ScoreGoodsCategory" id="ScoreGoodsCategorySimpleMap">
+ <id property="id" column="id" />
+ <result property="createBy" column="create_by" />
+ <result property="createTime" column="create_time" />
+ <result property="updateBy" column="update_by" />
+ <result property="updateTime" column="update_time" />
+ <result property="parentId" column="parent_id" />
+ <result property="cateName" column="cate_name" />
+ <result property="cateCode" column="cate_code" />
+ <result property="companyId" column="company_id" />
+ </resultMap>
+
+</mapper>
\ No newline at end of file
diff --git a/zq-erp/src/main/resources/mybatis/mapper/score/ScoreGoodsDao.xml b/zq-erp/src/main/resources/mybatis/mapper/score/ScoreGoodsDao.xml
new file mode 100644
index 0000000..7084899
--- /dev/null
+++ b/zq-erp/src/main/resources/mybatis/mapper/score/ScoreGoodsDao.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.matrix.system.score.dao.ScoreGoodsDao">
+ <!-- 定义ScoreGoods 的复杂关联map -->
+ <resultMap type="com.matrix.system.score.entity.ScoreGoods" id="ScoreGoodsMap">
+ <id property="id" column="id" />
+ <result property="createBy" column="create_by" />
+ <result property="createTime" column="create_time" />
+ <result property="updateBy" column="update_by" />
+ <result property="updateTime" column="update_time" />
+ <result property="goodsName" column="goods_name" />
+ <result property="goodsCode" column="goods_code" />
+ <result property="categoryId" column="category_id" />
+ <result property="state" column="state" />
+ <result property="limitedNum" column="limited_num" />
+ <result property="scorePrice" column="score_price" />
+ <result property="markPrice" column="mark_price" />
+ <result property="details" column="details" />
+ <result property="navigationId" column="navigation_id" />
+ <result property="remarks" column="remarks" />
+ <result property="companyId" column="company_id" />
+ </resultMap>
+
+
+ <!-- 定义ScoreGoods 的简单map ，本map不添加其他的关联属性 -->
+ <resultMap type="com.matrix.system.score.entity.ScoreGoods" id="ScoreGoodsSimpleMap">
+ <id property="id" column="id" />
+ <result property="createBy" column="create_by" />
+ <result property="createTime" column="create_time" />
+ <result property="updateBy" column="update_by" />
+ <result property="updateTime" column="update_time" />
+ <result property="goodsName" column="goods_name" />
+ <result property="goodsCode" column="goods_code" />
+ <result property="categoryId" column="category_id" />
+ <result property="state" column="state" />
+ <result property="limitedNum" column="limited_num" />
+ <result property="scorePrice" column="score_price" />
+ <result property="markPrice" column="mark_price" />
+ <result property="details" column="details" />
+ <result property="navigationId" column="navigation_id" />
+ <result property="remarks" column="remarks" />
+ <result property="companyId" column="company_id" />
+ </resultMap>
+
+</mapper>
\ No newline at end of file
diff --git a/zq-erp/src/main/resources/mybatis/mapper/score/ScoreGoodsImageDao.xml b/zq-erp/src/main/resources/mybatis/mapper/score/ScoreGoodsImageDao.xml
new file mode 100644
index 0000000..63a26d2
--- /dev/null
+++ b/zq-erp/src/main/resources/mybatis/mapper/score/ScoreGoodsImageDao.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.matrix.system.score.dao.ScoreGoodsImageDao">
+ <!-- 定义ScoreGoodsImage 的复杂关联map -->
+ <resultMap type="com.matrix.system.score.entity.ScoreGoodsImage" id="ScoreGoodsImageMap">
+ <id property="id" column="id" />
+ <result property="createBy" column="create_by" />
+ <result property="createTime" column="create_time" />
+ <result property="updateBy" column="update_by" />
+ <result property="updateTime" column="update_time" />
+ <result property="imgPath" column="img_path" />
+ <result property="imgMain" column="img_main" />
+ <result property="imgSort" column="img_sort" />
+ <result property="goodsId" column="goods_id" />
+ <result property="companyId" column="company_id" />
+ </resultMap>
+
+
+ <!-- 定义ScoreGoodsImage 的简单map ，本map不添加其他的关联属性 -->
+ <resultMap type="com.matrix.system.score.entity.ScoreGoodsImage" id="ScoreGoodsImageSimpleMap">
+ <id property="id" column="id" />
+ <result property="createBy" column="create_by" />
+ <result property="createTime" column="create_time" />
+ <result property="updateBy" column="update_by" />
+ <result property="updateTime" column="update_time" />
+ <result property="imgPath" column="img_path" />
+ <result property="imgMain" column="img_main" />
+ <result property="imgSort" column="img_sort" />
+ <result property="goodsId" column="goods_id" />
+ <result property="companyId" column="company_id" />
+ </resultMap>
+
+</mapper>
\ No newline at end of file
diff --git a/zq-erp/src/main/resources/mybatis/mapper/score/ScoreGoodsNavigationDao.xml b/zq-erp/src/main/resources/mybatis/mapper/score/ScoreGoodsNavigationDao.xml
new file mode 100644
index 0000000..4062055
--- /dev/null
+++ b/zq-erp/src/main/resources/mybatis/mapper/score/ScoreGoodsNavigationDao.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.matrix.system.score.dao.ScoreGoodsNavigationDao">
+ <!-- 定义ScoreGoodsNavigation 的复杂关联map -->
+ <resultMap type="com.matrix.system.score.entity.ScoreGoodsNavigation" id="ScoreGoodsNavigationMap">
+ <id property="id" column="id" />
+ <result property="createBy" column="create_by" />
+ <result property="createTime" column="create_time" />
+ <result property="updateBy" column="update_by" />
+ <result property="updateTime" column="update_time" />
+ <result property="naviName" column="navi_name" />
+ <result property="naviCode" column="navi_code" />
+ <result property="companyId" column="company_id" />
+ </resultMap>
+
+
+ <!-- 定义ScoreGoodsNavigation 的简单map ，本map不添加其他的关联属性 -->
+ <resultMap type="com.matrix.system.score.entity.ScoreGoodsNavigation" id="ScoreGoodsNavigationSimpleMap">
+ <id property="id" column="id" />
+ <result property="createBy" column="create_by" />
+ <result property="createTime" column="create_time" />
+ <result property="updateBy" column="update_by" />
+ <result property="updateTime" column="update_time" />
+ <result property="naviName" column="navi_name" />
+ <result property="naviCode" column="navi_code" />
+ <result property="companyId" column="company_id" />
+ </resultMap>
+
+</mapper>
\ No newline at end of file
diff --git a/zq-erp/src/main/resources/mybatis/mapper/score/ScoreGoodsSkuDao.xml b/zq-erp/src/main/resources/mybatis/mapper/score/ScoreGoodsSkuDao.xml
new file mode 100644
index 0000000..e690eac
--- /dev/null
+++ b/zq-erp/src/main/resources/mybatis/mapper/score/ScoreGoodsSkuDao.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.matrix.system.score.dao.ScoreGoodsSkuDao">
+ <!-- 定义ScoreGoodsSku 的复杂关联map -->
+ <resultMap type="com.matrix.system.score.entity.ScoreGoodsSku" id="ScoreGoodsSkuMap">
+ <id property="id" column="id" />
+ <result property="createBy" column="create_by" />
+ <result property="createTime" column="create_time" />
+ <result property="updateBy" column="update_by" />
+ <result property="updateTime" column="update_time" />
+ <result property="skuName" column="sku_name" />
+ <result property="imgPath" column="img_path" />
+ <result property="scorePrice" column="score_price" />
+ <result property="reserve" column="reserve" />
+ <result property="skuSort" column="sku_sort" />
+ <result property="goodsId" column="goods_id" />
+ <result property="skuErpCode" column="sku_erp_code" />
+ <result property="companyId" column="company_id" />
+ </resultMap>
+
+
+ <!-- 定义ScoreGoodsSku 的简单map ，本map不添加其他的关联属性 -->
+ <resultMap type="com.matrix.system.score.entity.ScoreGoodsSku" id="ScoreGoodsSkuSimpleMap">
+ <id property="id" column="id" />
+ <result property="createBy" column="create_by" />
+ <result property="createTime" column="create_time" />
+ <result property="updateBy" column="update_by" />
+ <result property="updateTime" column="update_time" />
+ <result property="skuName" column="sku_name" />
+ <result property="imgPath" column="img_path" />
+ <result property="scorePrice" column="score_price" />
+ <result property="reserve" column="reserve" />
+ <result property="skuSort" column="sku_sort" />
+ <result property="goodsId" column="goods_id" />
+ <result property="skuErpCode" column="sku_erp_code" />
+ <result property="companyId" column="company_id" />
+ </resultMap>
+
+</mapper>
\ No newline at end of file
diff --git a/zq-erp/src/main/resources/mybatis/mapper/score/ScoreOrderDao.xml b/zq-erp/src/main/resources/mybatis/mapper/score/ScoreOrderDao.xml
index 2175afa..7990b58 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/score/ScoreOrderDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/score/ScoreOrderDao.xml
@@ -1,5 +1,53 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
<mapper namespace="com.matrix.system.score.dao.ScoreOrderDao">
+ <!-- 定义ScoreOrder 的复杂关联map -->
+ <resultMap type="com.matrix.system.score.entity.ScoreOrder" id="ScoreOrderMap">
+ <id property="id" column="id" />
+ <result property="createBy" column="create_by" />
+ <result property="createTime" column="create_time" />
+ <result property="updateBy" column="update_by" />
+ <result property="updateTime" column="update_time" />
+ <result property="orderCode" column="order_code" />
+ <result property="memberId" column="member_id" />
+ <result property="memberPhone" column="member_phone" />
+ <result property="payTotalScore" column="pay_total_score" />
+ <result property="orderState" column="order_state" />
+ <result property="orderTime" column="order_time" />
+ <result property="payTime" column="pay_time" />
+ <result property="receiveWay" column="receive_way" />
+ <result property="addressId" column="address_id" />
+ <result property="selfAddress" column="self_address" />
+ <result property="selfTime" column="self_time" />
+ <result property="logisticsId" column="logistics_id" />
+ <result property="remarks" column="remarks" />
+ <result property="companyId" column="company_id" />
+ </resultMap>
+
+
+ <!-- 定义ScoreOrder 的简单map ，本map不添加其他的关联属性 -->
+ <resultMap type="com.matrix.system.score.entity.ScoreOrder" id="ScoreOrderSimpleMap">
+ <id property="id" column="id" />
+ <result property="createBy" column="create_by" />
+ <result property="createTime" column="create_time" />
+ <result property="updateBy" column="update_by" />
+ <result property="updateTime" column="update_time" />
+ <result property="orderCode" column="order_code" />
+ <result property="memberId" column="member_id" />
+ <result property="memberPhone" column="member_phone" />
+ <result property="payTotalScore" column="pay_total_score" />
+ <result property="orderState" column="order_state" />
+ <result property="orderTime" column="order_time" />
+ <result property="payTime" column="pay_time" />
+ <result property="receiveWay" column="receive_way" />
+ <result property="addressId" column="address_id" />
+ <result property="selfAddress" column="self_address" />
+ <result property="selfTime" column="self_time" />
+ <result property="logisticsId" column="logistics_id" />
+ <result property="remarks" column="remarks" />
+ <result property="companyId" column="company_id" />
+ </resultMap>
</mapper>
\ No newline at end of file
diff --git a/zq-erp/src/main/resources/mybatis/mapper/score/ScoreOrderItemDao.xml b/zq-erp/src/main/resources/mybatis/mapper/score/ScoreOrderItemDao.xml
new file mode 100644
index 0000000..e89de39
--- /dev/null
+++ b/zq-erp/src/main/resources/mybatis/mapper/score/ScoreOrderItemDao.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.matrix.system.score.dao.ScoreOrderItemDao">
+ <!-- 定义ScoreOrderItem 的复杂关联map -->
+ <resultMap type="com.matrix.system.score.entity.ScoreOrderItem" id="ScoreOrderItemMap">
+ <id property="id" column="id" />
+ <result property="createBy" column="create_by" />
+ <result property="createTime" column="create_time" />
+ <result property="updateBy" column="update_by" />
+ <result property="updateTime" column="update_time" />
+ <result property="goodsId" column="goods_id" />
+ <result property="goodsName" column="goods_name" />
+ <result property="goodsCode" column="goods_code" />
+ <result property="goodsNum" column="goods_num" />
+ <result property="payScore" column="pay_score" />
+ <result property="orderId" column="order_id" />
+ <result property="companyId" column="company_id" />
+ </resultMap>
+
+
+ <!-- 定义ScoreOrderItem 的简单map ，本map不添加其他的关联属性 -->
+ <resultMap type="com.matrix.system.score.entity.ScoreOrderItem" id="ScoreOrderItemSimpleMap">
+ <id property="id" column="id" />
+ <result property="createBy" column="create_by" />
+ <result property="createTime" column="create_time" />
+ <result property="updateBy" column="update_by" />
+ <result property="updateTime" column="update_time" />
+ <result property="goodsId" column="goods_id" />
+ <result property="goodsName" column="goods_name" />
+ <result property="goodsCode" column="goods_code" />
+ <result property="goodsNum" column="goods_num" />
+ <result property="payScore" column="pay_score" />
+ <result property="orderId" column="order_id" />
+ <result property="companyId" column="company_id" />
+ </resultMap>
+
+</mapper>
\ No newline at end of file
diff --git a/zq-erp/src/main/resources/mybatis/mapper/score/ScoreRuleSettingDao.xml b/zq-erp/src/main/resources/mybatis/mapper/score/ScoreRuleSettingDao.xml
new file mode 100644
index 0000000..a0678f4
--- /dev/null
+++ b/zq-erp/src/main/resources/mybatis/mapper/score/ScoreRuleSettingDao.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.matrix.system.score.dao.ScoreRuleSettingDao">
+
+</mapper>
\ No newline at end of file
diff --git a/zq-erp/src/main/resources/mybatis/mapper/score/ScoreShoppingCarDao.xml b/zq-erp/src/main/resources/mybatis/mapper/score/ScoreShoppingCarDao.xml
new file mode 100644
index 0000000..61630b8
--- /dev/null
+++ b/zq-erp/src/main/resources/mybatis/mapper/score/ScoreShoppingCarDao.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.matrix.system.score.dao.ScoreShoppingCarDao">
+ <!-- 定义ScoreShoppingCar 的复杂关联map -->
+ <resultMap type="com.matrix.system.score.entity.ScoreShoppingCar" id="ScoreShoppingCarMap">
+ <id property="id" column="id" />
+ <result property="createBy" column="create_by" />
+ <result property="createTime" column="create_time" />
+ <result property="updateBy" column="update_by" />
+ <result property="updateTime" column="update_time" />
+ <result property="userId" column="user_id" />
+ <result property="goodsId" column="goods_id" />
+ <result property="count" column="count" />
+ <result property="companyId" column="company_id" />
+ </resultMap>
+
+
+ <!-- 定义ScoreShoppingCar 的简单map ，本map不添加其他的关联属性 -->
+ <resultMap type="com.matrix.system.score.entity.ScoreShoppingCar" id="ScoreShoppingCarSimpleMap">
+ <id property="id" column="id" />
+ <result property="createBy" column="create_by" />
+ <result property="createTime" column="create_time" />
+ <result property="updateBy" column="update_by" />
+ <result property="updateTime" column="update_time" />
+ <result property="userId" column="user_id" />
+ <result property="goodsId" column="goods_id" />
+ <result property="count" column="count" />
+ <result property="companyId" column="company_id" />
+ </resultMap>
+
+</mapper>
\ No newline at end of file
diff --git a/zq-erp/src/main/resources/mybatis/mapper/score/ScoreUseRecordDao.xml b/zq-erp/src/main/resources/mybatis/mapper/score/ScoreUseRecordDao.xml
new file mode 100644
index 0000000..ca3b694
--- /dev/null
+++ b/zq-erp/src/main/resources/mybatis/mapper/score/ScoreUseRecordDao.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.matrix.system.score.dao.ScoreUseRecordDao">
+ <!-- 定义ScoreUseRecord 的复杂关联map -->
+ <resultMap type="com.matrix.system.score.entity.ScoreUseRecord" id="ScoreUseRecordMap">
+ <id property="id" column="id" />
+ <result property="createBy" column="create_by" />
+ <result property="createTime" column="create_time" />
+ <result property="updateBy" column="update_by" />
+ <result property="updateTime" column="update_time" />
+ <result property="recType" column="rec_type" />
+ <result property="recNum" column="rec_num" />
+ <result property="businessId" column="business_id" />
+ <result property="scoreVipDetailId" column="score_vip_detail_id" />
+ <result property="preScore" column="pre_score" />
+ <result property="nowScore" column="now_score" />
+ <result property="userId" column="user_id" />
+ <result property="remarks" column="remarks" />
+ <result property="companyId" column="company_id" />
+ </resultMap>
+
+
+ <!-- 定义ScoreUseRecord 的简单map ，本map不添加其他的关联属性 -->
+ <resultMap type="com.matrix.system.score.entity.ScoreUseRecord" id="ScoreUseRecordSimpleMap">
+ <id property="id" column="id" />
+ <result property="createBy" column="create_by" />
+ <result property="createTime" column="create_time" />
+ <result property="updateBy" column="update_by" />
+ <result property="updateTime" column="update_time" />
+ <result property="recType" column="rec_type" />
+ <result property="recNum" column="rec_num" />
+ <result property="businessId" column="business_id" />
+ <result property="scoreVipDetailId" column="score_vip_detail_id" />
+ <result property="preScore" column="pre_score" />
+ <result property="nowScore" column="now_score" />
+ <result property="userId" column="user_id" />
+ <result property="remarks" column="remarks" />
+ <result property="companyId" column="company_id" />
+ </resultMap>
+
+</mapper>
\ No newline at end of file
diff --git a/zq-erp/src/main/resources/mybatis/mapper/score/ScoreVipDetailDao.xml b/zq-erp/src/main/resources/mybatis/mapper/score/ScoreVipDetailDao.xml
new file mode 100644
index 0000000..f7fe0c0
--- /dev/null
+++ b/zq-erp/src/main/resources/mybatis/mapper/score/ScoreVipDetailDao.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.matrix.system.score.dao.ScoreVipDetailDao">
+ <!-- 定义ScoreVipDetail 的复杂关联map -->
+ <resultMap type="com.matrix.system.score.entity.ScoreVipDetail" id="ScoreVipDetailMap">
+ <id property="id" column="id" />
+ <result property="createBy" column="create_by" />
+ <result property="createTime" column="create_time" />
+ <result property="updateBy" column="update_by" />
+ <result property="updateTime" column="update_time" />
+ <result property="type" column="type" />
+ <result property="allScore" column="all_score" />
+ <result property="usedScore" column="used_score" />
+ <result property="remainScore" column="remain_score" />
+ <result property="gainTime" column="gain_time" />
+ <result property="validiteTime" column="validite_time" />
+ <result property="state" column="state" />
+ <result property="businessId" column="business_id" />
+ <result property="companyId" column="company_id" />
+ </resultMap>
+
+
+ <!-- 定义ScoreVipDetail 的简单map ，本map不添加其他的关联属性 -->
+ <resultMap type="com.matrix.system.score.entity.ScoreVipDetail" id="ScoreVipDetailSimpleMap">
+ <id property="id" column="id" />
+ <result property="createBy" column="create_by" />
+ <result property="createTime" column="create_time" />
+ <result property="updateBy" column="update_by" />
+ <result property="updateTime" column="update_time" />
+ <result property="type" column="type" />
+ <result property="allScore" column="all_score" />
+ <result property="usedScore" column="used_score" />
+ <result property="remainScore" column="remain_score" />
+ <result property="gainTime" column="gain_time" />
+ <result property="validiteTime" column="validite_time" />
+ <result property="state" column="state" />
+ <result property="businessId" column="business_id" />
+ <result property="companyId" column="company_id" />
+ </resultMap>
+
+</mapper>
\ No newline at end of file
--
Gitblit v1.9.1