Merge remote-tracking branch 'origin/dev' into dev

08.src/Xingxi/xingxi-admin/src/main/java/com/xingxi/web/controller/master/ipInfo/controller/IpInfoController.java

@@ -23,9 +23,9 @@ import java.util.List;
  * @date 2025-03-09
  */
 @Controller
-@RequestMapping("/system/ipInfo")
+@RequestMapping("/master/ipInfo")
 public class IpInfoController extends BaseController {
-    private final String prefix = "system/ipInfo";
+    private final String prefix = "master/ipInfo";
 
     @Resource
     private IIpInfoService ipInfoService;

08.src/Xingxi/xingxi-admin/src/main/java/com/xingxi/web/controller/master/product/controller/ProdClassController.java

@@ -0,0 +1,115 @@
+package com.xingxi.web.controller.master.product.controller;
+
+import com.xingxi.common.annotation.Log;
+import com.xingxi.common.core.controller.BaseController;
+import com.xingxi.common.core.domain.AjaxResult;
+import com.xingxi.common.core.page.TableDataInfo;
+import com.xingxi.common.enums.BusinessType;
+import com.xingxi.common.utils.poi.ExcelUtil;
+import com.xingxi.master.product.domain.ProdClass;
+import com.xingxi.master.product.service.IProdClassService;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 商品分类Controller
+ *
+ * @author ruoyi
+ * @date 2025-03-09
+ */
+@Controller
+@RequestMapping("/master/product/class")
+public class ProdClassController extends BaseController {
+    private final String prefix = "master/product/class";
+
+    @Resource
+    private IProdClassService prodClassService;
+
+    @RequiresPermissions("master:product:class:view")
+    @GetMapping()
+    public String prodClass() {
+        return prefix + "/prodClass";
+    }
+
+    /**
+     * 查询商品分类列表
+     */
+    @RequiresPermissions("master:product:class:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(ProdClass prodClass) {
+        startPage();
+        List<ProdClass> list = prodClassService.selectProdClassList(prodClass);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出商品分类列表
+     */
+    @RequiresPermissions("master:product:class:export")
+    @Log(title = "商品分类", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(ProdClass prodClass) {
+        List<ProdClass> list = prodClassService.selectProdClassList(prodClass);
+        ExcelUtil<ProdClass> util = new ExcelUtil<>(ProdClass.class);
+        return util.exportExcel(list, "商品分类数据");
+    }
+
+    /**
+     * 新增商品分类
+     */
+    @GetMapping("/add")
+    public String add() {
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增保存商品分类
+     */
+    @RequiresPermissions("master:product:class:add")
+    @Log(title = "商品分类", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(ProdClass prodClass) {
+        return toAjax(prodClassService.insertProdClass(prodClass));
+    }
+
+    /**
+     * 修改商品分类
+     */
+    @RequiresPermissions("master:product:class:edit")
+    @GetMapping("/edit/{prodClassId}")
+    public String edit(@PathVariable("prodClassId") Long prodClassId, ModelMap mMap) {
+        ProdClass prodClass = prodClassService.selectProdClassByProdClassId(prodClassId);
+        mMap.put("prodClass", prodClass);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存商品分类
+     */
+    @RequiresPermissions("master:product:class:edit")
+    @Log(title = "商品分类", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(ProdClass prodClass) {
+        return toAjax(prodClassService.updateProdClass(prodClass));
+    }
+
+    /**
+     * 删除商品分类
+     */
+    @RequiresPermissions("master:product:class:remove")
+    @Log(title = "商品分类", businessType = BusinessType.DELETE)
+    @PostMapping("/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids) {
+        return toAjax(prodClassService.deleteProdClassByProdClassIds(ids));
+    }
+}

08.src/Xingxi/xingxi-admin/src/main/java/com/xingxi/web/controller/system/SysFileUploadController.java

@@ -43,6 +43,30 @@ public class SysFileUploadController extends BaseController {
         return ajaxResult;
     }
 
+    @PostMapping("/avatar")
+    public AjaxResult designerAvatar(MultipartFile imageFile, @RequestHeader(required = false, name = "X-File-Type") String xFileType) {
+        EUploadFileType eUploadFileType = EUploadFileType.AVATAR;
+        EUploadFileType[] eUploadFileTypes = EUploadFileType.values();
+        for (EUploadFileType uploadFileType : eUploadFileTypes) {
+            if (uploadFileType.getVal().equals(xFileType)) {
+                eUploadFileType = uploadFileType;
+                break;
+            }
+        }
+
+        AjaxResult ajaxResult = AjaxResult.success();
+        try {
+            ajaxResult.put("imageUrl", this.upload(imageFile, eUploadFileType));
+        } catch (Exception ex) {
+            if (ex instanceof InvalidExtensionException) {
+                ajaxResult = AjaxResult.error("文件格式错误，请选择图片文件");
+            } else {
+                ajaxResult = AjaxResult.error();
+            }
+        }
+        return ajaxResult;
+    }
+
     @PostMapping("/video")
     public AjaxResult video(MultipartFile videoFile) {
         AjaxResult ajaxResult = AjaxResult.success();

08.src/Xingxi/xingxi-admin/src/main/resources/application-local.yml

@@ -76,4 +76,4 @@ aliyun:
         accessKeySecret: kAIazWRGoz1ird2ynzwgcwWzM9vMCu
         bucketName: bucket-gululuq
         # 如果有自定义域名
-        customDomain: res.gululuq.com
+        customDomain: restest.gululuq.com

08.src/Xingxi/xingxi-admin/src/main/resources/templates/master/designer/add.html

@@ -38,9 +38,8 @@
     <script th:inline="javascript">
         var prefix = ctx + "master/designer"
         $('#designerAvatarUrl').change(function () {
-            var fileSize = 0;
-            fileSize = this. files[0].size;
-            fileSize=Math. round( fileSize/1024*100)/100;
+            var fileSize = this.files[0].size;
+            fileSize = Math.round(fileSize/1024*100)/100;
 
             if(fileSize>2048){
                 layer.msg('上传文件不得大于2M，请重新上传。', {time: 3000, icon:6});
@@ -56,7 +55,7 @@
                 var formdata = new FormData();
                 formdata.append("imageFile", this.files[0]);
                 $.ajax({
-                    url: ctx + "common/upload/file/image",
+                    url: ctx + "common/upload/file/designerAvatar",
                     data: formdata,
                     type: "post",
                     processData: false,
@@ -66,11 +65,11 @@
                         $.modal.disable();
                     },
                     success: function (result) {
-                        if (result.code == web_status.SUCCESS) {
+                        if (result.code === web_status.SUCCESS) {
                             $('#designerAvatarImg').attr('src', result.imageUrl);
                             $('#designerAvatar').val(result.imageUrl);
                             $.modal.alertSuccess(result.msg)
-                        } else if (result.code == web_status.WARNING) {
+                        } else if (result.code === web_status.WARNING) {
                             $.modal.alertWarning(result.msg)
                         } else {
                             $.modal.alertError(result.msg);

08.src/Xingxi/xingxi-admin/src/main/resources/templates/master/designer/edit.html

@@ -39,9 +39,8 @@
     <script th:inline="javascript">
         var prefix = ctx + "master/designer";
         $('#designerAvatarUrl').change(function () {
-            var fileSize = 0;
-            fileSize = this. files[0].size;
-            fileSize=Math. round( fileSize/1024*100)/100;
+            var fileSize = this.files[0].size;
+            fileSize = Math.round(fileSize/1024*100)/100;
 
             if(fileSize>2048){
                 layer.msg('上传文件不得大于2M，请重新上传。', {time: 3000, icon:6});
@@ -67,11 +66,11 @@
                         $.modal.disable();
                     },
                     success: function (result) {
-                        if (result.code == web_status.SUCCESS) {
+                        if (result.code === web_status.SUCCESS) {
                             $('#designerAvatarImg').attr('src', result.imageUrl);
                             $('#designerAvatar').val(result.imageUrl);
                             $.modal.alertSuccess(result.msg)
-                        } else if (result.code == web_status.WARNING) {
+                        } else if (result.code === web_status.WARNING) {
                             $.modal.alertWarning(result.msg)
                         } else {
                             $.modal.alertError(result.msg);

08.src/Xingxi/xingxi-admin/src/main/resources/templates/master/ipInfo/add.html

@@ -5,10 +5,10 @@
 </head>
 <body class="white-bg">
     <div class="wrapper wrapper-content animated fadeInRight ibox-content">
-        <form class="form-horizontal m" id="form-ipinfo-add">
+        <form class="form-horizontal m" id="form-ipInfo-add">
             <div class="col-xs-12">
                 <div class="form-group">
-                    <label class="col-sm-3 control-label">文创品牌名：</label>
+                    <label class="col-sm-3 control-label">文创品牌名称：</label>
                     <div class="col-sm-8">
                         <input name="ipName" class="form-control" type="text">
                     </div>
@@ -16,9 +16,11 @@
             </div>
             <div class="col-xs-12">
                 <div class="form-group">
-                    <label class="col-sm-3 control-label">ip图片：</label>
+                    <label class="col-sm-3 control-label">文创图片：</label>
                     <div class="col-sm-8">
-                        <input name="ipUrl" class="form-control" type="text">
+                        <img id="ipUrlImg" width="30%" height="30%" src="">
+                        <input type="file" class="form-control" name="ipInfoUrl" id="ipInfoUrl" accept="image/*"/>
+                        <input type="hidden" class="form-control" name="ipUrl" id="ipUrl" />
                     </div>
                 </div>
             </div>
@@ -38,26 +40,62 @@
                     </div>
                 </div>
             </div>
-            <div class="col-xs-12">
-                <div class="form-group">
-                    <label class="col-sm-3 control-label">删除标志：</label>
-                    <div class="col-sm-8">
-                        <input name="delFlag" class="form-control" type="text">
-                    </div>
-                </div>
-            </div>
         </form>
     </div>
     <th:block th:include="include :: footer" />
     <script th:inline="javascript">
-        var prefix = ctx + "system/ipinfo"
-        $("#form-ipinfo-add").validate({
+        var prefix = ctx + "master/ipInfo"
+        $('#ipInfoUrl').change(function () {
+            var fileSize = this.files[0].size;
+            fileSize = Math.round(fileSize/1024*100)/100;
+
+            if(fileSize>2048){
+                layer.msg('上传文件不得大于2M，请重新上传。', {time: 3000, icon:6});
+                return false;
+            }
+
+            if (!/image\/\w+/.test(this.files[0].type)) {
+                layer.msg('上传的不是图片文件，请重新上传。', {time: 3000, icon:6});
+                return false;
+            }
+
+            if ($(this).val()) {
+                var formdata = new FormData();
+                formdata.append("imageFile", this.files[0]);
+                $.ajax({
+                    url: ctx + "common/upload/file/image",
+                    data: formdata,
+                    type: "post",
+                    processData: false,
+                    contentType: false,
+                    beforeSend: function () {
+                        $.modal.loading("正在处理中，请稍后...");
+                        $.modal.disable();
+                    },
+                    success: function (result) {
+                        if (result.code === web_status.SUCCESS) {
+                            $('#ipUrlImg').attr('src', result.imageUrl);
+                            $('#ipUrl').val(result.imageUrl);
+                            $.modal.alertSuccess(result.msg)
+                        } else if (result.code === web_status.WARNING) {
+                            $.modal.alertWarning(result.msg)
+                        } else {
+                            $.modal.alertError(result.msg);
+                        }
+                        $.modal.closeLoading();
+                        $.modal.enable();
+                    }
+                })
+            }
+        });
+
+        $("#form-ipInfo-add").validate({
             focusCleanup: true
         });
 
         function submitHandler() {
             if ($.validate.form()) {
-                $.operate.save(prefix + "/add", $('#form-ipinfo-add').serialize());
+                $.operate.save(prefix + "/add", $('#form-ipInfo-add').serialize());
             }
         }
     </script>

08.src/Xingxi/xingxi-admin/src/main/resources/templates/master/ipInfo/edit.html

@@ -5,7 +5,7 @@
 </head>
 <body class="white-bg">
     <div class="wrapper wrapper-content animated fadeInRight ibox-content">
-        <form class="form-horizontal m" id="form-ipinfo-edit" th:object="${ipinfo}">
+        <form class="form-horizontal m" id="form-ipInfo-edit" th:object="${ipInfo}">
             <input name="ipId" th:field="*{ipInfoId}" type="hidden">
             <div class="col-xs-12">
                 <div class="form-group">
@@ -19,7 +19,9 @@
                 <div class="form-group">
                     <label class="col-sm-3 control-label">ip图片：</label>
                     <div class="col-sm-8">
-                        <input name="ipUrl" th:field="*{ipUrl}" class="form-control" type="text">
+                        <img id="ipUrlImg" width="30%" height="30%">
+                        <input type="file" class="form-control" name="ipInfoUrl" id="ipInfoUrl" accept="image/*"/>
+                        <input type="hidden" lass="form-control" name="ipUrl" id="ipUrl" />
                     </div>
                 </div>
             </div>
@@ -51,14 +53,58 @@
     </div>
     <th:block th:include="include :: footer" />
     <script th:inline="javascript">
-        var prefix = ctx + "system/ipinfo";
-        $("#form-ipinfo-edit").validate({
+        var prefix = ctx + "master/ipInfo";
+        $('#ipInfoUrl').change(function () {
+            var fileSize = this.files[0].size;
+            fileSize = Math.round(fileSize/1024*100)/100;
+
+            if(fileSize>2048){
+                layer.msg('上传文件不得大于2M，请重新上传。', {time: 3000, icon:6});
+                return false;
+            }
+
+            if (!/image\/\w+/.test(this.files[0].type)) {
+                layer.msg('上传的不是图片文件，请重新上传。', {time: 3000, icon:6});
+                return false;
+            }
+
+            if ($(this).val()) {
+                var formdata = new FormData();
+                formdata.append("imageFile", this.files[0]);
+                $.ajax({
+                    url: ctx + "common/upload/file/image",
+                    data: formdata,
+                    type: "post",
+                    processData: false,
+                    contentType: false,
+                    beforeSend: function () {
+                        $.modal.loading("正在处理中，请稍后...");
+                        $.modal.disable();
+                    },
+                    success: function (result) {
+                        if (result.code === web_status.SUCCESS) {
+                            $('#ipUrlImg').attr('src', result.imageUrl);
+                            $('#ipUrl').val(result.imageUrl);
+                            $.modal.alertSuccess(result.msg)
+                        } else if (result.code === web_status.WARNING) {
+                            $.modal.alertWarning(result.msg)
+                        } else {
+                            $.modal.alertError(result.msg);
+                        }
+                        $.modal.closeLoading();
+                        $.modal.enable();
+                    }
+                })
+            }
+        });
+
+        $("#form-ipInfo-edit").validate({
             focusCleanup: true
         });
 
         function submitHandler() {
             if ($.validate.form()) {
-                $.operate.save(prefix + "/edit", $('#form-ipinfo-edit').serialize());
+                $.operate.save(prefix + "/edit", $('#form-ipInfo-edit').serialize());
             }
         }
     </script>

08.src/Xingxi/xingxi-admin/src/main/resources/templates/master/ipInfo/ipInfo.html

@@ -11,42 +11,10 @@
                     <div class="select-list">
                         <ul>
                             <li>
-                                <label>文创品牌名：</label>
+                                <label>品牌名：</label>
                                 <input type="text" name="ipName"/>
                             </li>
                             <li>
-                                <label>ip图片：</label>
-                                <input type="text" name="ipUrl"/>
-                            </li>
-                            <li>
-                                <label>色号：</label>
-                                <input type="text" name="colorNo"/>
-                            </li>
-                            <li>
-                                <label>显示顺序：</label>
-                                <input type="text" name="sort"/>
-                            </li>
-                            <li>
-                                <label>删除标志：</label>
-                                <input type="text" name="delFlag"/>
-                            </li>
-                            <li>
-                                <label>创建者：</label>
-                                <input type="text" name="createUser"/>
-                            </li>
-                            <li>
-                                <label>创建时间：</label>
-                                <input type="text" class="time-input" placeholder="请选择创建时间" name="createTime"/>
-                            </li>
-                            <li>
-                                <label>更新者：</label>
-                                <input type="text" name="updateUser"/>
-                            </li>
-                            <li>
-                                <label>更新时间：</label>
-                                <input type="text" class="time-input" placeholder="请选择更新时间" name="updateTime"/>
-                            </li>
-                            <li>
                                 <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
                                 <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
                             </li>
@@ -56,18 +24,15 @@
             </div>
 
             <div class="btn-group-sm" id="toolbar" role="group">
-                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:ipinfo:add">
+                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="master:ipInfo:add">
                     <i class="fa fa-plus"></i> 添加
                 </a>
-                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:ipinfo:edit">
+                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="master:ipInfo:edit">
                     <i class="fa fa-edit"></i> 修改
                 </a>
-                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:ipinfo:remove">
+                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="master:ipInfo:remove">
                     <i class="fa fa-remove"></i> 删除
                 </a>
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:ipinfo:export">
-                    <i class="fa fa-download"></i> 导出
-                </a>
             </div>
             <div class="col-sm-12 select-table table-striped">
                 <table id="bootstrap-table"></table>
@@ -76,9 +41,9 @@
     </div>
     <th:block th:include="include :: footer" />
     <script th:inline="javascript">
-        var editFlag = [[${@permission.hasPermi('system:ipinfo:edit')}]];
-        var removeFlag = [[${@permission.hasPermi('system:ipinfo:remove')}]];
-        var prefix = ctx + "system/ipinfo";
+        var editFlag = [[${@permission.hasPermi('system:ipInfo:edit')}]];
+        var removeFlag = [[${@permission.hasPermi('system:ipInfo:remove')}]];
+        var prefix = ctx + "master/ipInfo";
 
         $(function() {
             var options = {
@@ -88,60 +53,39 @@
                 removeUrl: prefix + "/remove",
                 exportUrl: prefix + "/export",
                 modalName: "文创品牌",
-                columns: [{
-                    checkbox: true
-                },
-                {
-                    field: 'ipId',
-                    title: '主键',
-                    visible: false
-                },
-                {
-                    field: 'ipName',
-                    title: '文创品牌名'
-                },
-                {
-                    field: 'ipUrl',
-                    title: 'ip图片'
-                },
-                {
-                    field: 'colorNo',
-                    title: '色号'
-                },
-                {
-                    field: 'sort',
-                    title: '显示顺序'
-                },
-                {
-                    field: 'delFlag',
-                    title: '删除标志'
-                },
-                {
-                    field: 'createUser',
-                    title: '创建者'
-                },
-                {
-                    field: 'createTime',
-                    title: '创建时间'
-                },
-                {
-                    field: 'updateUser',
-                    title: '更新者'
-                },
-                {
-                    field: 'updateTime',
-                    title: '更新时间'
-                },
-                {
-                    title: '操作',
-                    align: 'center',
-                    formatter: function(value, row, index) {
-                        var actions = [];
-                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.ipId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
-                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.ipId + '\')"><i class="fa fa-remove"></i>删除</a>');
-                        return actions.join('');
+                columns: [
+                    {
+                        field: 'ipId',
+                        title: '主键',
+                        visible: false
+                    },
+                    {
+                        field: 'ipName',
+                        title: '文创品牌名'
+                    },
+                    {
+                        field: 'ipUrl',
+                        title: 'IP图片'
+                    },
+                    {
+                        field: 'colorNo',
+                        title: '色号'
+                    },
+                    {
+                        field: 'sort',
+                        title: '显示顺序'
+                    },
+                    {
+                        title: '操作',
+                        align: 'center',
+                        formatter: function(value, row, index) {
+                            var actions = [];
+                            actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.ipId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                            actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.ipId + '\')"><i class="fa fa-remove"></i>删除</a>');
+                            return actions.join('');
+                        }
                     }
-                }]
+                ]
             };
             $.table.init(options);
         });

08.src/Xingxi/xingxi-admin/src/main/resources/templates/master/product/class/add.html

@@ -0,0 +1,49 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('新增商品分类')" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-class-add">
+            <div class="col-xs-12">
+                <div class="form-group">
+                    <label class="col-sm-3 control-label">商品分类名称：</label>
+                    <div class="col-sm-8">
+                        <input name="className" class="form-control" type="text">
+                    </div>
+                </div>
+            </div>
+            <div class="col-xs-12">
+                <div class="form-group">
+                    <label class="col-sm-3 control-label">商品分类图片：</label>
+                    <div class="col-sm-8">
+                        <input name="classUrl" class="form-control" type="text">
+                    </div>
+                </div>
+            </div>
+            <div class="col-xs-12">
+                <div class="form-group">
+                    <label class="col-sm-3 control-label">顺序：</label>
+                    <div class="col-sm-8">
+                        <input name="sort" class="form-control" type="text">
+                    </div>
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var prefix = ctx + "system/class"
+        $("#form-class-add").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/add", $('#form-class-add').serialize());
+            }
+        }
+    </script>
+</body>
+</html>

08.src/Xingxi/xingxi-admin/src/main/resources/templates/master/product/class/edit.html

@@ -0,0 +1,58 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('修改商品分类')" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-class-edit" th:object="${mProdClass}">
+            <input name="prodClassId" th:field="*{prodClassId}" type="hidden">
+            <div class="col-xs-12">
+                <div class="form-group">
+                    <label class="col-sm-3 control-label">商品分类名称：</label>
+                    <div class="col-sm-8">
+                        <input name="className" th:field="*{className}" class="form-control" type="text">
+                    </div>
+                </div>
+            </div>
+            <div class="col-xs-12">
+                <div class="form-group">
+                    <label class="col-sm-3 control-label">商品分类图片：</label>
+                    <div class="col-sm-8">
+                        <input name="classUrl" th:field="*{classUrl}" class="form-control" type="text">
+                    </div>
+                </div>
+            </div>
+            <div class="col-xs-12">
+                <div class="form-group">
+                    <label class="col-sm-3 control-label">顺序：</label>
+                    <div class="col-sm-8">
+                        <input name="sort" th:field="*{sort}" class="form-control" type="text">
+                    </div>
+                </div>
+            </div>
+            <div class="col-xs-12">
+                <div class="form-group">
+                    <label class="col-sm-3 control-label">删除标志：</label>
+                    <div class="col-sm-8">
+                        <input name="delFlag" th:field="*{delFlag}" class="form-control" type="text">
+                    </div>
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var prefix = ctx + "system/class";
+        $("#form-class-edit").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/edit", $('#form-class-edit').serialize());
+            }
+        }
+    </script>
+</body>
+</html>

08.src/Xingxi/xingxi-admin/src/main/resources/templates/master/product/class/prodClass.html

@@ -0,0 +1,91 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('商品分类列表')" />
+</head>
+<body class="gray-bg">
+     <div class="container-div">
+        <div class="row">
+            <div class="col-sm-12 search-collapse">
+                <form id="formId">
+                    <div class="select-list">
+                        <ul>
+                            <li>
+                                <label>分类名称：</label>
+                                <input type="text" name="className"/>
+                            </li>
+                            <li>
+                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                            </li>
+                        </ul>
+                    </div>
+                </form>
+            </div>
+
+            <div class="btn-group-sm" id="toolbar" role="group">
+                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:class:add">
+                    <i class="fa fa-plus"></i> 添加
+                </a>
+                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:class:edit">
+                    <i class="fa fa-edit"></i> 修改
+                </a>
+                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:class:remove">
+                    <i class="fa fa-remove"></i> 删除
+                </a>
+            </div>
+            <div class="col-sm-12 select-table table-striped">
+                <table id="bootstrap-table"></table>
+            </div>
+        </div>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var editFlag = [[${@permission.hasPermi('master:product:class:edit')}]];
+        var removeFlag = [[${@permission.hasPermi('master:product:class:remove')}]];
+        var prefix = ctx + "master/product/class";
+
+        $(function() {
+            var options = {
+                url: prefix + "/list",
+                createUrl: prefix + "/add",
+                updateUrl: prefix + "/edit/{id}",
+                removeUrl: prefix + "/remove",
+                exportUrl: prefix + "/export",
+                modalName: "商品分类",
+                columns: [{
+                    checkbox: true
+                },
+                {
+                    field: 'prodClassId',
+                    title: '主键',
+                    visible: false
+                },
+                {
+                    field: 'className',
+                    title: '商品分类名称'
+                },
+                {
+                    field: 'classUrl',
+                    title: '商品分类图片'
+                },
+                {
+                    field: 'sort',
+                    title: '顺序'
+                },
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.prodClassId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.prodClassId + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        return actions.join('');
+                    }
+                }]
+            };
+            $.table.init(options);
+        });
+    </script>
+</body>
+</html>

08.src/Xingxi/xingxi-admin/src/main/resources/templates/master/product/prod/add.html

@@ -0,0 +1,49 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('新增推荐商品')" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-prod-add">
+            <div class="col-xs-12">
+                <div class="form-group">
+                    <label class="col-sm-3 control-label">商品ID：</label>
+                    <div class="col-sm-8">
+                        <input name="prodId" class="form-control" type="text">
+                    </div>
+                </div>
+            </div>
+            <div class="col-xs-12">
+                <div class="form-group">
+                    <label class="col-sm-3 control-label">顺序：</label>
+                    <div class="col-sm-8">
+                        <input name="sort" class="form-control" type="text">
+                    </div>
+                </div>
+            </div>
+            <div class="col-xs-12">
+                <div class="form-group">
+                    <label class="col-sm-3 control-label">删除标志：</label>
+                    <div class="col-sm-8">
+                        <input name="delFlag" class="form-control" type="text">
+                    </div>
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var prefix = ctx + "system/prod"
+        $("#form-prod-add").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/add", $('#form-prod-add').serialize());
+            }
+        }
+    </script>
+</body>
+</html>

08.src/Xingxi/xingxi-admin/src/main/resources/templates/master/product/prod/edit.html

@@ -0,0 +1,50 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('修改推荐商品')" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-prod-edit" th:object="${tSuggestProd}">
+            <input name="id" th:field="*{id}" type="hidden">
+            <div class="col-xs-12">
+                <div class="form-group">
+                    <label class="col-sm-3 control-label">商品ID：</label>
+                    <div class="col-sm-8">
+                        <input name="prodId" th:field="*{prodId}" class="form-control" type="text">
+                    </div>
+                </div>
+            </div>
+            <div class="col-xs-12">
+                <div class="form-group">
+                    <label class="col-sm-3 control-label">顺序：</label>
+                    <div class="col-sm-8">
+                        <input name="sort" th:field="*{sort}" class="form-control" type="text">
+                    </div>
+                </div>
+            </div>
+            <div class="col-xs-12">
+                <div class="form-group">
+                    <label class="col-sm-3 control-label">删除标志：</label>
+                    <div class="col-sm-8">
+                        <input name="delFlag" th:field="*{delFlag}" class="form-control" type="text">
+                    </div>
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var prefix = ctx + "system/prod";
+        $("#form-prod-edit").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/edit", $('#form-prod-edit').serialize());
+            }
+        }
+    </script>
+</body>
+</html>

08.src/Xingxi/xingxi-admin/src/main/resources/templates/master/product/prod/prod.html

@@ -0,0 +1,134 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('推荐商品列表')" />
+</head>
+<body class="gray-bg">
+     <div class="container-div">
+        <div class="row">
+            <div class="col-sm-12 search-collapse">
+                <form id="formId">
+                    <div class="select-list">
+                        <ul>
+                            <li>
+                                <label>商品ID：</label>
+                                <input type="text" name="prodId"/>
+                            </li>
+                            <li>
+                                <label>顺序：</label>
+                                <input type="text" name="sort"/>
+                            </li>
+                            <li>
+                                <label>删除标志：</label>
+                                <input type="text" name="delFlag"/>
+                            </li>
+                            <li>
+                                <label>创建者：</label>
+                                <input type="text" name="createUser"/>
+                            </li>
+                            <li>
+                                <label>创建时间：</label>
+                                <input type="text" class="time-input" placeholder="请选择创建时间" name="createTime"/>
+                            </li>
+                            <li>
+                                <label>更新者：</label>
+                                <input type="text" name="updateUser"/>
+                            </li>
+                            <li>
+                                <label>更新时间：</label>
+                                <input type="text" class="time-input" placeholder="请选择更新时间" name="updateTime"/>
+                            </li>
+                            <li>
+                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                            </li>
+                        </ul>
+                    </div>
+                </form>
+            </div>
+
+            <div class="btn-group-sm" id="toolbar" role="group">
+                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:prod:add">
+                    <i class="fa fa-plus"></i> 添加
+                </a>
+                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:prod:edit">
+                    <i class="fa fa-edit"></i> 修改
+                </a>
+                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:prod:remove">
+                    <i class="fa fa-remove"></i> 删除
+                </a>
+                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:prod:export">
+                    <i class="fa fa-download"></i> 导出
+                </a>
+            </div>
+            <div class="col-sm-12 select-table table-striped">
+                <table id="bootstrap-table"></table>
+            </div>
+        </div>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var editFlag = [[${@permission.hasPermi('system:prod:edit')}]];
+        var removeFlag = [[${@permission.hasPermi('system:prod:remove')}]];
+        var prefix = ctx + "system/prod";
+
+        $(function() {
+            var options = {
+                url: prefix + "/list",
+                createUrl: prefix + "/add",
+                updateUrl: prefix + "/edit/{id}",
+                removeUrl: prefix + "/remove",
+                exportUrl: prefix + "/export",
+                modalName: "推荐商品",
+                columns: [{
+                    checkbox: true
+                },
+                {
+                    field: 'id',
+                    title: '主键',
+                    visible: false
+                },
+                {
+                    field: 'prodId',
+                    title: '商品ID'
+                },
+                {
+                    field: 'sort',
+                    title: '顺序'
+                },
+                {
+                    field: 'delFlag',
+                    title: '删除标志'
+                },
+                {
+                    field: 'createUser',
+                    title: '创建者'
+                },
+                {
+                    field: 'createTime',
+                    title: '创建时间'
+                },
+                {
+                    field: 'updateUser',
+                    title: '更新者'
+                },
+                {
+                    field: 'updateTime',
+                    title: '更新时间'
+                },
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        return actions.join('');
+                    }
+                }]
+            };
+            $.table.init(options);
+        });
+    </script>
+</body>
+</html>

08.src/Xingxi/xingxi-common/src/main/java/com/xingxi/common/core/controller/BaseController.java

@@ -120,17 +120,12 @@ public class BaseController {
     protected String upload(MultipartFile file, EUploadFileType eUploadFileType) {
         String filePath = eUploadFileType.getPath();
         if (file != null && !file.isEmpty()) {
-            if (eUploadFileType.equals(EUploadFileType.IMAGE) ||
-                    eUploadFileType.equals(EUploadFileType.MERC) ||
-                    eUploadFileType.equals(EUploadFileType.VOUCHER)) {
+            if (eUploadFileType.equals(EUploadFileType.IMAGE)) {
                 return FileUploadUtils.upload(filePath, file, MimeTypeUtils.IMAGE_EXTENSION);
             }
             if (eUploadFileType.equals(EUploadFileType.VIDEO)) {
                 return FileUploadUtils.upload(filePath, file, MimeTypeUtils.MEDIA_EXTENSION);
             }
-            if (eUploadFileType.equals(EUploadFileType.EXCEL)) {
-                return FileUploadUtils.upload(filePath, file, MimeTypeUtils.EXCEL_EXTENSION);
-            }
         }
         return null;
     }

08.src/Xingxi/xingxi-common/src/main/java/com/xingxi/common/enums/EUploadFileType.java

@@ -11,12 +11,9 @@ import lombok.Getter;
 @Getter
 @AllArgsConstructor
 public enum EUploadFileType implements BaseEnum {
-    MERC("merc", "public/merc/privacy", "身份证和营业执照之类"),
-    VOUCHER("voucher", "public/merc/voucher", "业务凭证"),
-    INVOICE("invoice", "public/merc/invoice", "发票"),
+    AVATAR("avatar", "public/avatar", "各种头像"),
     IMAGE("image", "public/image", "各种公共图片"),
-    VIDEO("video", "public/video", "视频"),
-    EXCEL("excel", "public/file", "视频");
+    VIDEO("video", "public/video", "视频");
 
     private final String val;
     private final String path;

08.src/Xingxi/xingxi-system/src/main/resources/mapper/business/BannerMapper.xml

@@ -0,0 +1,153 @@
+<?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.xingxi.business.Banner.mapper.BannerMapper">
+    <resultMap type="Banner" id="BannerResult">
+        <result property="bannerId"    column="bannerId"    />
+        <result property="bannerUrl"    column="bannerUrl"    />
+        <result property="bannerType"    column="bannerType"    />
+        <result property="prodId"    column="prodId"    />
+        <result property="newsId"    column="newsId"    />
+        <result property="sort"    column="sort"    />
+        <result property="delFlag"    column="delFlag"    />
+        <result property="createUser"    column="createUser"    />
+        <result property="createTime"    column="createTime"    />
+        <result property="updateUser"    column="updateUser"    />
+        <result property="updateTime"    column="updateTime"    />
+    </resultMap>
+
+    <sql id="selectBanner">
+        select bannerId, bannerUrl, bannerType, prodId, newsId, sort, delFlag, createUser, createTime, updateUser, updateTime from t_banner
+    </sql>
+
+    <sql id="selectBannerExt">
+        select
+            ${tableAlias}.bannerId,
+            ${tableAlias}.bannerUrl,
+            ${tableAlias}.bannerType,
+            ${tableAlias}.prodId,
+            ${tableAlias}.newsId,
+            ${tableAlias}.sort,
+            ${tableAlias}.delFlag,
+            ${tableAlias}.createUser,
+            ${tableAlias}.createTime,
+            ${tableAlias}.updateUser,
+            ${tableAlias}.updateTime
+        from t_banner ${tableAlias}
+    </sql>
+
+    <select id="selectBannerList" parameterType="Banner" resultMap="BannerResult">
+        <include refid="selectBanner"/>
+        <where>  
+            <if test="bannerUrl != null  and bannerUrl != ''"> and bannerUrl = #{bannerUrl}</if>
+            <if test="bannerType != null  and bannerType != ''"> and bannerType = #{bannerType}</if>
+            <if test="prodId != null "> and prodId = #{prodId}</if>
+            <if test="newsId != null "> and newsId = #{newsId}</if>
+            <if test="sort != null "> and sort = #{sort}</if>
+            <if test="delFlag != null  and delFlag != ''"> and delFlag = #{delFlag}</if>
+            <if test="createUser != null  and createUser != ''"> and createUser = #{createUser}</if>
+            <if test="createTime != null "> and createTime = #{createTime}</if>
+            <if test="updateUser != null  and updateUser != ''"> and updateUser = #{updateUser}</if>
+            <if test="updateTime != null "> and updateTime = #{updateTime}</if>
+        </where>
+    </select>
+
+    <select id="selectBannerByBannerId" parameterType="Long" resultMap="BannerResult">
+        <include refid="selectBanner"/>
+        where bannerId = #{bannerId}
+    </select>
+        
+    <insert id="insertBanner" parameterType="Banner" useGeneratedKeys="true" keyProperty="bannerId">
+        insert into t_banner
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="bannerUrl != null">bannerUrl,</if>
+            <if test="bannerType != null">bannerType,</if>
+            <if test="prodId != null">prodId,</if>
+            <if test="newsId != null">newsId,</if>
+            <if test="sort != null">sort,</if>
+            <if test="delFlag != null">delFlag,</if>
+            <if test="createUser != null">createUser,</if>
+            <if test="createTime != null">createTime,</if>
+            <if test="updateUser != null">updateUser,</if>
+            <if test="updateTime != null">updateTime,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="bannerUrl != null">#{bannerUrl},</if>
+            <if test="bannerType != null">#{bannerType},</if>
+            <if test="prodId != null">#{prodId},</if>
+            <if test="newsId != null">#{newsId},</if>
+            <if test="sort != null">#{sort},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createUser != null">#{createUser},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateUser != null">#{updateUser},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+         </trim>
+    </insert>
+
+    <insert id="batchInsertBanner">
+        insert into t_banner( bannerUrl, bannerType, prodId, newsId, sort, delFlag, createUser, createTime, updateUser, updateTime) values
+        <foreach item="item" index="index" collection="list" separator=",">
+            ( #{item.bannerUrl}, #{item.bannerType}, #{item.prodId}, #{item.newsId}, #{item.sort}, #{item.delFlag}, #{item.createUser}, #{item.createTime}, #{item.updateUser}, #{item.updateTime})
+        </foreach>
+    </insert>
+
+    <update id="updateBanner" parameterType="Banner">
+        update t_banner
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="bannerUrl != null">bannerUrl = #{bannerUrl},</if>
+            <if test="bannerType != null">bannerType = #{bannerType},</if>
+            <if test="prodId != null">prodId = #{prodId},</if>
+            <if test="newsId != null">newsId = #{newsId},</if>
+            <if test="sort != null">sort = #{sort},</if>
+            <if test="delFlag != null">delFlag = #{delFlag},</if>
+            <if test="createUser != null">createUser = #{createUser},</if>
+            <if test="createTime != null">createTime = #{createTime},</if>
+            <if test="updateUser != null">updateUser = #{updateUser},</if>
+            <if test="updateTime != null">updateTime = #{updateTime},</if>
+        </trim>
+        where bannerId = #{bannerId}
+    </update>
+
+    <delete id="deleteBannerByBannerId" parameterType="Long">
+        delete from t_banner where bannerId = #{bannerId}
+    </delete>
+
+    <delete id="deleteBannerByBannerIds" parameterType="String">
+        delete from t_banner where bannerId in 
+        <foreach item="bannerId" collection="array" open="(" separator="," close=")">
+            #{bannerId}
+        </foreach>
+    </delete>
+
+    <update id="logicDeleteBannerByBannerId" parameterType="Long">
+        update t_banner
+            set delFlag = '1'
+        where bannerId = #{bannerId}
+    </update>
+
+    <update id="logicDeleteBannerByBannerIds" parameterType="String">
+        update t_banner
+        set delFlag = '1'
+        where bannerId in
+        <foreach item="bannerId" collection="array" open="(" separator="," close=")">
+            #{bannerId}
+        </foreach>
+    </update>
+
+    <update id="logicDeleteBannerByCondition" parameterType="Banner">
+        update t_banner
+        set delFlag = '1'
+        <where>
+            <if test="bannerUrl != null  and bannerUrl != ''"> and bannerUrl = #{bannerUrl}</if>
+            <if test="bannerType != null  and bannerType != ''"> and bannerType = #{bannerType}</if>
+            <if test="prodId != null "> and prodId = #{prodId}</if>
+            <if test="newsId != null "> and newsId = #{newsId}</if>
+            <if test="sort != null "> and sort = #{sort}</if>
+            <if test="delFlag != null  and delFlag != ''"> and delFlag = #{delFlag}</if>
+            <if test="createUser != null  and createUser != ''"> and createUser = #{createUser}</if>
+            <if test="createTime != null "> and createTime = #{createTime}</if>
+            <if test="updateUser != null  and updateUser != ''"> and updateUser = #{updateUser}</if>
+            <if test="updateTime != null "> and updateTime = #{updateTime}</if>
+        </where>
+    </update>
+</mapper>

08.src/Xingxi/xingxi-system/src/main/resources/mapper/business/CartsMapper.xml

@@ -0,0 +1,160 @@
+<?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.xingxi.business.Carts.mapper.CartsMapper">
+    <resultMap type="Carts" id="CartsResult">
+        <result property="id"    column="id"    />
+        <result property="userId"    column="user_id"    />
+        <result property="mercId"    column="mercId"    />
+        <result property="prodId"    column="prodId"    />
+        <result property="prodAttrId"    column="prodAttrId"    />
+        <result property="quantity"    column="quantity"    />
+        <result property="checkFlag"    column="checkFlag"    />
+        <result property="delFlag"    column="delFlag"    />
+        <result property="createUser"    column="createUser"    />
+        <result property="createTime"    column="createTime"    />
+        <result property="updateUser"    column="updateUser"    />
+        <result property="updateTime"    column="updateTime"    />
+    </resultMap>
+
+    <sql id="selectCarts">
+        select id, user_id, mercId, prodId, prodAttrId, quantity, checkFlag, delFlag, createUser, createTime, updateUser, updateTime from t_carts
+    </sql>
+
+    <sql id="selectCartsExt">
+        select
+            ${tableAlias}.id,
+            ${tableAlias}.user_id,
+            ${tableAlias}.mercId,
+            ${tableAlias}.prodId,
+            ${tableAlias}.prodAttrId,
+            ${tableAlias}.quantity,
+            ${tableAlias}.checkFlag,
+            ${tableAlias}.delFlag,
+            ${tableAlias}.createUser,
+            ${tableAlias}.createTime,
+            ${tableAlias}.updateUser,
+            ${tableAlias}.updateTime
+        from t_carts ${tableAlias}
+    </sql>
+
+    <select id="selectCartsList" parameterType="Carts" resultMap="CartsResult">
+        <include refid="selectCarts"/>
+        <where>  
+            <if test="userId != null  and userId != ''"> and user_id = #{userId}</if>
+            <if test="mercId != null "> and mercId = #{mercId}</if>
+            <if test="prodId != null "> and prodId = #{prodId}</if>
+            <if test="prodAttrId != null "> and prodAttrId = #{prodAttrId}</if>
+            <if test="quantity != null "> and quantity = #{quantity}</if>
+            <if test="checkFlag != null  and checkFlag != ''"> and checkFlag = #{checkFlag}</if>
+            <if test="delFlag != null  and delFlag != ''"> and delFlag = #{delFlag}</if>
+            <if test="createUser != null  and createUser != ''"> and createUser = #{createUser}</if>
+            <if test="createTime != null "> and createTime = #{createTime}</if>
+            <if test="updateUser != null  and updateUser != ''"> and updateUser = #{updateUser}</if>
+            <if test="updateTime != null "> and updateTime = #{updateTime}</if>
+        </where>
+    </select>
+    
+    <select id="selectCartsById" parameterType="Long" resultMap="CartsResult">
+        <include refid="selectCarts"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertCarts" parameterType="Carts" useGeneratedKeys="true" keyProperty="id">
+        insert into t_carts
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="userId != null">user_id,</if>
+            <if test="mercId != null">mercId,</if>
+            <if test="prodId != null">prodId,</if>
+            <if test="prodAttrId != null">prodAttrId,</if>
+            <if test="quantity != null">quantity,</if>
+            <if test="checkFlag != null">checkFlag,</if>
+            <if test="delFlag != null">delFlag,</if>
+            <if test="createUser != null">createUser,</if>
+            <if test="createTime != null">createTime,</if>
+            <if test="updateUser != null">updateUser,</if>
+            <if test="updateTime != null">updateTime,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="userId != null">#{userId},</if>
+            <if test="mercId != null">#{mercId},</if>
+            <if test="prodId != null">#{prodId},</if>
+            <if test="prodAttrId != null">#{prodAttrId},</if>
+            <if test="quantity != null">#{quantity},</if>
+            <if test="checkFlag != null">#{checkFlag},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createUser != null">#{createUser},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateUser != null">#{updateUser},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+         </trim>
+    </insert>
+
+    <insert id="batchInsertCarts">
+        insert into t_carts( user_id, mercId, prodId, prodAttrId, quantity, checkFlag, delFlag, createUser, createTime, updateUser, updateTime) values
+        <foreach item="item" index="index" collection="list" separator=",">
+            ( #{item.userId}, #{item.mercId}, #{item.prodId}, #{item.prodAttrId}, #{item.quantity}, #{item.checkFlag}, #{item.delFlag}, #{item.createUser}, #{item.createTime}, #{item.updateUser}, #{item.updateTime})
+        </foreach>
+    </insert>
+
+    <update id="updateCarts" parameterType="Carts">
+        update t_carts
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="userId != null">user_id = #{userId},</if>
+            <if test="mercId != null">mercId = #{mercId},</if>
+            <if test="prodId != null">prodId = #{prodId},</if>
+            <if test="prodAttrId != null">prodAttrId = #{prodAttrId},</if>
+            <if test="quantity != null">quantity = #{quantity},</if>
+            <if test="checkFlag != null">checkFlag = #{checkFlag},</if>
+            <if test="delFlag != null">delFlag = #{delFlag},</if>
+            <if test="createUser != null">createUser = #{createUser},</if>
+            <if test="createTime != null">createTime = #{createTime},</if>
+            <if test="updateUser != null">updateUser = #{updateUser},</if>
+            <if test="updateTime != null">updateTime = #{updateTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteCartsById" parameterType="Long">
+        delete from t_carts where id = #{id}
+    </delete>
+
+    <delete id="deleteCartsByIds" parameterType="String">
+        delete from t_carts where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+    <update id="logicDeleteCartsById" parameterType="Long">
+        update t_carts
+            set delFlag = '1'
+        where id = #{id}
+    </update>
+
+    <update id="logicDeleteCartsByIds" parameterType="String">
+        update t_carts
+        set delFlag = '1'
+        where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+
+    <update id="logicDeleteCartsByCondition" parameterType="Carts">
+        update t_carts
+        set delFlag = '1'
+        <where>
+            <if test="userId != null  and userId != ''"> and user_id = #{userId}</if>
+            <if test="mercId != null "> and mercId = #{mercId}</if>
+            <if test="prodId != null "> and prodId = #{prodId}</if>
+            <if test="prodAttrId != null "> and prodAttrId = #{prodAttrId}</if>
+            <if test="quantity != null "> and quantity = #{quantity}</if>
+            <if test="checkFlag != null  and checkFlag != ''"> and checkFlag = #{checkFlag}</if>
+            <if test="delFlag != null  and delFlag != ''"> and delFlag = #{delFlag}</if>
+            <if test="createUser != null  and createUser != ''"> and createUser = #{createUser}</if>
+            <if test="createTime != null "> and createTime = #{createTime}</if>
+            <if test="updateUser != null  and updateUser != ''"> and updateUser = #{updateUser}</if>
+            <if test="updateTime != null "> and updateTime = #{updateTime}</if>
+        </where>
+    </update>
+</mapper>

08.src/Xingxi/xingxi-system/src/main/resources/mapper/business/CopyrightApprovalMapper.xml

@@ -0,0 +1,139 @@
+<?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.xingxi.business.CopyrightApproval.mapper.CopyrightApprovalMapper">
+    <resultMap type="CopyrightApproval" id="CopyrightApprovalResult">
+        <result property="approvalId"    column="approvalId"    />
+        <result property="approvalNo"    column="approvalNo"    />
+        <result property="approvalStatus"    column="approvalStatus"    />
+        <result property="prodId"    column="prodId"    />
+        <result property="delFlag"    column="delFlag"    />
+        <result property="createUser"    column="createUser"    />
+        <result property="createTime"    column="createTime"    />
+        <result property="updateUser"    column="updateUser"    />
+        <result property="updateTime"    column="updateTime"    />
+    </resultMap>
+
+    <sql id="selectCopyrightApproval">
+        select approvalId, approvalNo, approvalStatus, prodId, delFlag, createUser, createTime, updateUser, updateTime from t_copyright_approval
+    </sql>
+
+    <sql id="selectCopyrightApprovalExt">
+        select
+            ${tableAlias}.approvalId,
+            ${tableAlias}.approvalNo,
+            ${tableAlias}.approvalStatus,
+            ${tableAlias}.prodId,
+            ${tableAlias}.delFlag,
+            ${tableAlias}.createUser,
+            ${tableAlias}.createTime,
+            ${tableAlias}.updateUser,
+            ${tableAlias}.updateTime
+        from t_copyright_approval ${tableAlias}
+    </sql>
+
+    <select id="selectCopyrightApprovalList" parameterType="CopyrightApproval" resultMap="CopyrightApprovalResult">
+        <include refid="selectCopyrightApproval"/>
+        <where>  
+            <if test="approvalNo != null  and approvalNo != ''"> and approvalNo = #{approvalNo}</if>
+            <if test="approvalStatus != null  and approvalStatus != ''"> and approvalStatus = #{approvalStatus}</if>
+            <if test="prodId != null "> and prodId = #{prodId}</if>
+            <if test="delFlag != null  and delFlag != ''"> and delFlag = #{delFlag}</if>
+            <if test="createUser != null  and createUser != ''"> and createUser = #{createUser}</if>
+            <if test="createTime != null "> and createTime = #{createTime}</if>
+            <if test="updateUser != null  and updateUser != ''"> and updateUser = #{updateUser}</if>
+            <if test="updateTime != null "> and updateTime = #{updateTime}</if>
+        </where>
+    </select>
+    
+    <select id="selectCopyrightApprovalByApprovalId" parameterType="Long" resultMap="CopyrightApprovalResult">
+        <include refid="selectCopyrightApproval"/>
+        where approvalId = #{approvalId}
+    </select>
+        
+    <insert id="insertCopyrightApproval" parameterType="CopyrightApproval" useGeneratedKeys="true" keyProperty="approvalId">
+        insert into t_copyright_approval
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="approvalNo != null">approvalNo,</if>
+            <if test="approvalStatus != null">approvalStatus,</if>
+            <if test="prodId != null">prodId,</if>
+            <if test="delFlag != null">delFlag,</if>
+            <if test="createUser != null">createUser,</if>
+            <if test="createTime != null">createTime,</if>
+            <if test="updateUser != null">updateUser,</if>
+            <if test="updateTime != null">updateTime,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="approvalNo != null">#{approvalNo},</if>
+            <if test="approvalStatus != null">#{approvalStatus},</if>
+            <if test="prodId != null">#{prodId},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createUser != null">#{createUser},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateUser != null">#{updateUser},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+         </trim>
+    </insert>
+
+    <insert id="batchInsertCopyrightApproval">
+        insert into t_copyright_approval( approvalNo, approvalStatus, prodId, delFlag, createUser, createTime, updateUser, updateTime) values
+        <foreach item="item" index="index" collection="list" separator=",">
+            ( #{item.approvalNo}, #{item.approvalStatus}, #{item.prodId}, #{item.delFlag}, #{item.createUser}, #{item.createTime}, #{item.updateUser}, #{item.updateTime})
+        </foreach>
+    </insert>
+
+    <update id="updateCopyrightApproval" parameterType="CopyrightApproval">
+        update t_copyright_approval
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="approvalNo != null">approvalNo = #{approvalNo},</if>
+            <if test="approvalStatus != null">approvalStatus = #{approvalStatus},</if>
+            <if test="prodId != null">prodId = #{prodId},</if>
+            <if test="delFlag != null">delFlag = #{delFlag},</if>
+            <if test="createUser != null">createUser = #{createUser},</if>
+            <if test="createTime != null">createTime = #{createTime},</if>
+            <if test="updateUser != null">updateUser = #{updateUser},</if>
+            <if test="updateTime != null">updateTime = #{updateTime},</if>
+        </trim>
+        where approvalId = #{approvalId}
+    </update>
+
+    <delete id="deleteCopyrightApprovalByApprovalId" parameterType="Long">
+        delete from t_copyright_approval where approvalId = #{approvalId}
+    </delete>
+
+    <delete id="deleteCopyrightApprovalByApprovalIds" parameterType="String">
+        delete from t_copyright_approval where approvalId in 
+        <foreach item="approvalId" collection="array" open="(" separator="," close=")">
+            #{approvalId}
+        </foreach>
+    </delete>
+
+    <update id="logicDeleteCopyrightApprovalByApprovalId" parameterType="Long">
+        update t_copyright_approval
+            set delFlag = '1'
+        where approvalId = #{approvalId}
+    </update>
+
+    <update id="logicDeleteCopyrightApprovalByApprovalIds" parameterType="String">
+        update t_copyright_approval
+        set delFlag = '1'
+        where approvalId in
+        <foreach item="approvalId" collection="array" open="(" separator="," close=")">
+            #{approvalId}
+        </foreach>
+    </update>
+
+    <update id="logicDeleteCopyrightApprovalByCondition" parameterType="CopyrightApproval">
+        update t_copyright_approval
+        set delFlag = '1'
+        <where>
+            <if test="approvalNo != null  and approvalNo != ''"> and approvalNo = #{approvalNo}</if>
+            <if test="approvalStatus != null  and approvalStatus != ''"> and approvalStatus = #{approvalStatus}</if>
+            <if test="prodId != null "> and prodId = #{prodId}</if>
+            <if test="delFlag != null  and delFlag != ''"> and delFlag = #{delFlag}</if>
+            <if test="createUser != null  and createUser != ''"> and createUser = #{createUser}</if>
+            <if test="createTime != null "> and createTime = #{createTime}</if>
+            <if test="updateUser != null  and updateUser != ''"> and updateUser = #{updateUser}</if>
+            <if test="updateTime != null "> and updateTime = #{updateTime}</if>
+        </where>
+    </update>
+</mapper>

08.src/Xingxi/xingxi-system/src/main/resources/mapper/business/ExpressInfoMapper.xml

@@ -0,0 +1,209 @@
+<?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.xingxi.business.ExpressInfo.mapper.ExpressInfoMapper">
+    <resultMap type="ExpressInfo" id="ExpressInfoResult">
+        <result property="expressInfoId"    column="expressInfoId"    />
+        <result property="expressNo"    column="expressNo"    />
+        <result property="exprTime"    column="exprTime"    />
+        <result property="exprContext"    column="exprContext"    />
+        <result property="returnCode"    column="returnCode"    />
+        <result property="returnState"    column="returnState"    />
+        <result property="returnMsg"    column="returnMsg"    />
+        <result property="exprCode"    column="exprCode"    />
+        <result property="exprName"    column="exprName"    />
+        <result property="exprSite"    column="exprSite"    />
+        <result property="exprPhone"    column="exprPhone"    />
+        <result property="exprLogo"    column="exprLogo"    />
+        <result property="exprCourier"    column="exprCourier"    />
+        <result property="courierPhone"    column="courierPhone"    />
+        <result property="delFlag"    column="delFlag"    />
+        <result property="createUser"    column="createUser"    />
+        <result property="createTime"    column="createTime"    />
+        <result property="updateUser"    column="updateUser"    />
+        <result property="updateTime"    column="updateTime"    />
+    </resultMap>
+
+    <sql id="selectExpressInfo">
+        select expressInfoId, expressNo, exprTime, exprContext, returnCode, returnState, returnMsg, exprCode, exprName, exprSite, exprPhone, exprLogo, exprCourier, courierPhone, delFlag, createUser, createTime, updateUser, updateTime from t_express_info
+    </sql>
+
+    <sql id="selectExpressInfoExt">
+        select
+            ${tableAlias}.expressInfoId,
+            ${tableAlias}.expressNo,
+            ${tableAlias}.exprTime,
+            ${tableAlias}.exprContext,
+            ${tableAlias}.returnCode,
+            ${tableAlias}.returnState,
+            ${tableAlias}.returnMsg,
+            ${tableAlias}.exprCode,
+            ${tableAlias}.exprName,
+            ${tableAlias}.exprSite,
+            ${tableAlias}.exprPhone,
+            ${tableAlias}.exprLogo,
+            ${tableAlias}.exprCourier,
+            ${tableAlias}.courierPhone,
+            ${tableAlias}.delFlag,
+            ${tableAlias}.createUser,
+            ${tableAlias}.createTime,
+            ${tableAlias}.updateUser,
+            ${tableAlias}.updateTime
+        from t_express_info ${tableAlias}
+    </sql>
+
+    <select id="selectExpressInfoList" parameterType="ExpressInfo" resultMap="ExpressInfoResult">
+        <include refid="selectExpressInfo"/>
+        <where>  
+            <if test="expressNo != null  and expressNo != ''"> and expressNo = #{expressNo}</if>
+            <if test="exprTime != null "> and exprTime = #{exprTime}</if>
+            <if test="exprContext != null  and exprContext != ''"> and exprContext = #{exprContext}</if>
+            <if test="returnCode != null  and returnCode != ''"> and returnCode = #{returnCode}</if>
+            <if test="returnState != null  and returnState != ''"> and returnState = #{returnState}</if>
+            <if test="returnMsg != null  and returnMsg != ''"> and returnMsg = #{returnMsg}</if>
+            <if test="exprCode != null  and exprCode != ''"> and exprCode = #{exprCode}</if>
+            <if test="exprName != null  and exprName != ''"> and exprName like concat('%', #{exprName}, '%')</if>
+            <if test="exprSite != null  and exprSite != ''"> and exprSite = #{exprSite}</if>
+            <if test="exprPhone != null  and exprPhone != ''"> and exprPhone = #{exprPhone}</if>
+            <if test="exprLogo != null  and exprLogo != ''"> and exprLogo = #{exprLogo}</if>
+            <if test="exprCourier != null  and exprCourier != ''"> and exprCourier = #{exprCourier}</if>
+            <if test="courierPhone != null  and courierPhone != ''"> and courierPhone = #{courierPhone}</if>
+            <if test="delFlag != null  and delFlag != ''"> and delFlag = #{delFlag}</if>
+            <if test="createUser != null  and createUser != ''"> and createUser = #{createUser}</if>
+            <if test="createTime != null "> and createTime = #{createTime}</if>
+            <if test="updateUser != null  and updateUser != ''"> and updateUser = #{updateUser}</if>
+            <if test="updateTime != null "> and updateTime = #{updateTime}</if>
+        </where>
+    </select>
+    
+    <select id="selectExpressInfoByExpressInfoId" parameterType="Long" resultMap="ExpressInfoResult">
+        <include refid="selectExpressInfo"/>
+        where expressInfoId = #{expressInfoId}
+    </select>
+        
+    <insert id="insertExpressInfo" parameterType="ExpressInfo" useGeneratedKeys="true" keyProperty="expressInfoId">
+        insert into t_express_info
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="expressNo != null">expressNo,</if>
+            <if test="exprTime != null">exprTime,</if>
+            <if test="exprContext != null">exprContext,</if>
+            <if test="returnCode != null">returnCode,</if>
+            <if test="returnState != null">returnState,</if>
+            <if test="returnMsg != null">returnMsg,</if>
+            <if test="exprCode != null">exprCode,</if>
+            <if test="exprName != null">exprName,</if>
+            <if test="exprSite != null">exprSite,</if>
+            <if test="exprPhone != null">exprPhone,</if>
+            <if test="exprLogo != null">exprLogo,</if>
+            <if test="exprCourier != null">exprCourier,</if>
+            <if test="courierPhone != null">courierPhone,</if>
+            <if test="delFlag != null">delFlag,</if>
+            <if test="createUser != null">createUser,</if>
+            <if test="createTime != null">createTime,</if>
+            <if test="updateUser != null">updateUser,</if>
+            <if test="updateTime != null">updateTime,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="expressNo != null">#{expressNo},</if>
+            <if test="exprTime != null">#{exprTime},</if>
+            <if test="exprContext != null">#{exprContext},</if>
+            <if test="returnCode != null">#{returnCode},</if>
+            <if test="returnState != null">#{returnState},</if>
+            <if test="returnMsg != null">#{returnMsg},</if>
+            <if test="exprCode != null">#{exprCode},</if>
+            <if test="exprName != null">#{exprName},</if>
+            <if test="exprSite != null">#{exprSite},</if>
+            <if test="exprPhone != null">#{exprPhone},</if>
+            <if test="exprLogo != null">#{exprLogo},</if>
+            <if test="exprCourier != null">#{exprCourier},</if>
+            <if test="courierPhone != null">#{courierPhone},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createUser != null">#{createUser},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateUser != null">#{updateUser},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+         </trim>
+    </insert>
+
+    <insert id="batchInsertExpressInfo">
+        insert into t_express_info( expressNo, exprTime, exprContext, returnCode, returnState, returnMsg, exprCode, exprName, exprSite, exprPhone, exprLogo, exprCourier, courierPhone, delFlag, createUser, createTime, updateUser, updateTime) values
+        <foreach item="item" index="index" collection="list" separator=",">
+            ( #{item.expressNo}, #{item.exprTime}, #{item.exprContext}, #{item.returnCode}, #{item.returnState}, #{item.returnMsg}, #{item.exprCode}, #{item.exprName}, #{item.exprSite}, #{item.exprPhone}, #{item.exprLogo}, #{item.exprCourier}, #{item.courierPhone}, #{item.delFlag}, #{item.createUser}, #{item.createTime}, #{item.updateUser}, #{item.updateTime})
+        </foreach>
+    </insert>
+
+    <update id="updateExpressInfo" parameterType="ExpressInfo">
+        update t_express_info
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="expressNo != null">expressNo = #{expressNo},</if>
+            <if test="exprTime != null">exprTime = #{exprTime},</if>
+            <if test="exprContext != null">exprContext = #{exprContext},</if>
+            <if test="returnCode != null">returnCode = #{returnCode},</if>
+            <if test="returnState != null">returnState = #{returnState},</if>
+            <if test="returnMsg != null">returnMsg = #{returnMsg},</if>
+            <if test="exprCode != null">exprCode = #{exprCode},</if>
+            <if test="exprName != null">exprName = #{exprName},</if>
+            <if test="exprSite != null">exprSite = #{exprSite},</if>
+            <if test="exprPhone != null">exprPhone = #{exprPhone},</if>
+            <if test="exprLogo != null">exprLogo = #{exprLogo},</if>
+            <if test="exprCourier != null">exprCourier = #{exprCourier},</if>
+            <if test="courierPhone != null">courierPhone = #{courierPhone},</if>
+            <if test="delFlag != null">delFlag = #{delFlag},</if>
+            <if test="createUser != null">createUser = #{createUser},</if>
+            <if test="createTime != null">createTime = #{createTime},</if>
+            <if test="updateUser != null">updateUser = #{updateUser},</if>
+            <if test="updateTime != null">updateTime = #{updateTime},</if>
+        </trim>
+        where expressInfoId = #{expressInfoId}
+    </update>
+
+    <delete id="deleteExpressInfoByExpressInfoId" parameterType="Long">
+        delete from t_express_info where expressInfoId = #{expressInfoId}
+    </delete>
+
+    <delete id="deleteExpressInfoByExpressInfoIds" parameterType="String">
+        delete from t_express_info where expressInfoId in 
+        <foreach item="expressInfoId" collection="array" open="(" separator="," close=")">
+            #{expressInfoId}
+        </foreach>
+    </delete>
+
+    <update id="logicDeleteExpressInfoByExpressInfoId" parameterType="Long">
+        update t_express_info
+            set delFlag = '1'
+        where expressInfoId = #{expressInfoId}
+    </update>
+
+    <update id="logicDeleteExpressInfoByExpressInfoIds" parameterType="String">
+        update t_express_info
+        set delFlag = '1'
+        where expressInfoId in
+        <foreach item="expressInfoId" collection="array" open="(" separator="," close=")">
+            #{expressInfoId}
+        </foreach>
+    </update>
+
+    <update id="logicDeleteExpressInfoByCondition" parameterType="ExpressInfo">
+        update t_express_info
+        set delFlag = '1'
+        <where>
+            <if test="expressNo != null  and expressNo != ''"> and expressNo = #{expressNo}</if>
+            <if test="exprTime != null "> and exprTime = #{exprTime}</if>
+            <if test="exprContext != null  and exprContext != ''"> and exprContext = #{exprContext}</if>
+            <if test="returnCode != null  and returnCode != ''"> and returnCode = #{returnCode}</if>
+            <if test="returnState != null  and returnState != ''"> and returnState = #{returnState}</if>
+            <if test="returnMsg != null  and returnMsg != ''"> and returnMsg = #{returnMsg}</if>
+            <if test="exprCode != null  and exprCode != ''"> and exprCode = #{exprCode}</if>
+            <if test="exprName != null  and exprName != ''"> and exprName like concat('%', #{exprName}, '%')</if>
+            <if test="exprSite != null  and exprSite != ''"> and exprSite = #{exprSite}</if>
+            <if test="exprPhone != null  and exprPhone != ''"> and exprPhone = #{exprPhone}</if>
+            <if test="exprLogo != null  and exprLogo != ''"> and exprLogo = #{exprLogo}</if>
+            <if test="exprCourier != null  and exprCourier != ''"> and exprCourier = #{exprCourier}</if>
+            <if test="courierPhone != null  and courierPhone != ''"> and courierPhone = #{courierPhone}</if>
+            <if test="delFlag != null  and delFlag != ''"> and delFlag = #{delFlag}</if>
+            <if test="createUser != null  and createUser != ''"> and createUser = #{createUser}</if>
+            <if test="createTime != null "> and createTime = #{createTime}</if>
+            <if test="updateUser != null  and updateUser != ''"> and updateUser = #{updateUser}</if>
+            <if test="updateTime != null "> and updateTime = #{updateTime}</if>
+        </where>
+    </update>
+</mapper>

08.src/Xingxi/xingxi-system/src/main/resources/mapper/business/MerchantWxpayMapper.xml

@@ -0,0 +1,167 @@
+<?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.xingxi.business.MerchantWxpay.mapper.MerchantWxpayMapper">
+    <resultMap type="MerchantWxpay" id="MerchantWxpayResult">
+        <result property="mercWxpayId"    column="mercWxpayId"    />
+        <result property="wxPayId"    column="wxPayId"    />
+        <result property="wxMchId"    column="wxMchId"    />
+        <result property="wxSecret"    column="wxSecret"    />
+        <result property="wxApiV3key"    column="wxApiV3key"    />
+        <result property="wxCert"    column="wxCert"    />
+        <result property="wxCertFile"    column="wxCertFile"    />
+        <result property="wxKeyFile"    column="wxKeyFile"    />
+        <result property="delFlag"    column="delFlag"    />
+        <result property="createUser"    column="createUser"    />
+        <result property="createTime"    column="createTime"    />
+        <result property="updateUser"    column="updateUser"    />
+        <result property="updateTime"    column="updateTime"    />
+    </resultMap>
+
+    <sql id="selectMerchantWxpay">
+        select mercWxpayId, wxPayId, wxMchId, wxSecret, wxApiV3key, wxCert, wxCertFile, wxKeyFile, delFlag, createUser, createTime, updateUser, updateTime from t_merchant_wxpay
+    </sql>
+
+    <sql id="selectMerchantWxpayExt">
+        select
+            ${tableAlias}.mercWxpayId,
+            ${tableAlias}.wxPayId,
+            ${tableAlias}.wxMchId,
+            ${tableAlias}.wxSecret,
+            ${tableAlias}.wxApiV3key,
+            ${tableAlias}.wxCert,
+            ${tableAlias}.wxCertFile,
+            ${tableAlias}.wxKeyFile,
+            ${tableAlias}.delFlag,
+            ${tableAlias}.createUser,
+            ${tableAlias}.createTime,
+            ${tableAlias}.updateUser,
+            ${tableAlias}.updateTime
+        from t_merchant_wxpay ${tableAlias}
+    </sql>
+
+    <select id="selectMerchantWxpayList" parameterType="MerchantWxpay" resultMap="MerchantWxpayResult">
+        <include refid="selectMerchantWxpay"/>
+        <where>  
+            <if test="wxPayId != null  and wxPayId != ''"> and wxPayId = #{wxPayId}</if>
+            <if test="wxMchId != null  and wxMchId != ''"> and wxMchId = #{wxMchId}</if>
+            <if test="wxSecret != null  and wxSecret != ''"> and wxSecret = #{wxSecret}</if>
+            <if test="wxApiV3key != null  and wxApiV3key != ''"> and wxApiV3key = #{wxApiV3key}</if>
+            <if test="wxCert != null  and wxCert != ''"> and wxCert = #{wxCert}</if>
+            <if test="wxCertFile != null  and wxCertFile != ''"> and wxCertFile = #{wxCertFile}</if>
+            <if test="wxKeyFile != null  and wxKeyFile != ''"> and wxKeyFile = #{wxKeyFile}</if>
+            <if test="delFlag != null  and delFlag != ''"> and delFlag = #{delFlag}</if>
+            <if test="createUser != null  and createUser != ''"> and createUser = #{createUser}</if>
+            <if test="createTime != null "> and createTime = #{createTime}</if>
+            <if test="updateUser != null  and updateUser != ''"> and updateUser = #{updateUser}</if>
+            <if test="updateTime != null "> and updateTime = #{updateTime}</if>
+        </where>
+    </select>
+    
+    <select id="selectMerchantWxpayByMercWxpayId" parameterType="Long" resultMap="MerchantWxpayResult">
+        <include refid="selectMerchantWxpay"/>
+        where mercWxpayId = #{mercWxpayId}
+    </select>
+        
+    <insert id="insertMerchantWxpay" parameterType="MerchantWxpay" useGeneratedKeys="true" keyProperty="mercWxpayId">
+        insert into t_merchant_wxpay
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="wxPayId != null">wxPayId,</if>
+            <if test="wxMchId != null">wxMchId,</if>
+            <if test="wxSecret != null">wxSecret,</if>
+            <if test="wxApiV3key != null">wxApiV3key,</if>
+            <if test="wxCert != null">wxCert,</if>
+            <if test="wxCertFile != null">wxCertFile,</if>
+            <if test="wxKeyFile != null">wxKeyFile,</if>
+            <if test="delFlag != null">delFlag,</if>
+            <if test="createUser != null">createUser,</if>
+            <if test="createTime != null">createTime,</if>
+            <if test="updateUser != null">updateUser,</if>
+            <if test="updateTime != null">updateTime,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="wxPayId != null">#{wxPayId},</if>
+            <if test="wxMchId != null">#{wxMchId},</if>
+            <if test="wxSecret != null">#{wxSecret},</if>
+            <if test="wxApiV3key != null">#{wxApiV3key},</if>
+            <if test="wxCert != null">#{wxCert},</if>
+            <if test="wxCertFile != null">#{wxCertFile},</if>
+            <if test="wxKeyFile != null">#{wxKeyFile},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createUser != null">#{createUser},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateUser != null">#{updateUser},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+         </trim>
+    </insert>
+
+    <insert id="batchInsertMerchantWxpay">
+        insert into t_merchant_wxpay( wxPayId, wxMchId, wxSecret, wxApiV3key, wxCert, wxCertFile, wxKeyFile, delFlag, createUser, createTime, updateUser, updateTime) values
+        <foreach item="item" index="index" collection="list" separator=",">
+            ( #{item.wxPayId}, #{item.wxMchId}, #{item.wxSecret}, #{item.wxApiV3key}, #{item.wxCert}, #{item.wxCertFile}, #{item.wxKeyFile}, #{item.delFlag}, #{item.createUser}, #{item.createTime}, #{item.updateUser}, #{item.updateTime})
+        </foreach>
+    </insert>
+
+    <update id="updateMerchantWxpay" parameterType="MerchantWxpay">
+        update t_merchant_wxpay
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="wxPayId != null">wxPayId = #{wxPayId},</if>
+            <if test="wxMchId != null">wxMchId = #{wxMchId},</if>
+            <if test="wxSecret != null">wxSecret = #{wxSecret},</if>
+            <if test="wxApiV3key != null">wxApiV3key = #{wxApiV3key},</if>
+            <if test="wxCert != null">wxCert = #{wxCert},</if>
+            <if test="wxCertFile != null">wxCertFile = #{wxCertFile},</if>
+            <if test="wxKeyFile != null">wxKeyFile = #{wxKeyFile},</if>
+            <if test="delFlag != null">delFlag = #{delFlag},</if>
+            <if test="createUser != null">createUser = #{createUser},</if>
+            <if test="createTime != null">createTime = #{createTime},</if>
+            <if test="updateUser != null">updateUser = #{updateUser},</if>
+            <if test="updateTime != null">updateTime = #{updateTime},</if>
+        </trim>
+        where mercWxpayId = #{mercWxpayId}
+    </update>
+
+    <delete id="deleteMerchantWxpayByMercWxpayId" parameterType="Long">
+        delete from t_merchant_wxpay where mercWxpayId = #{mercWxpayId}
+    </delete>
+
+    <delete id="deleteMerchantWxpayByMercWxpayIds" parameterType="String">
+        delete from t_merchant_wxpay where mercWxpayId in 
+        <foreach item="mercWxpayId" collection="array" open="(" separator="," close=")">
+            #{mercWxpayId}
+        </foreach>
+    </delete>
+
+    <update id="logicDeleteMerchantWxpayByMercWxpayId" parameterType="Long">
+        update t_merchant_wxpay
+            set delFlag = '1'
+        where mercWxpayId = #{mercWxpayId}
+    </update>
+
+    <update id="logicDeleteMerchantWxpayByMercWxpayIds" parameterType="String">
+        update t_merchant_wxpay
+        set delFlag = '1'
+        where mercWxpayId in
+        <foreach item="mercWxpayId" collection="array" open="(" separator="," close=")">
+            #{mercWxpayId}
+        </foreach>
+    </update>
+
+    <update id="logicDeleteMerchantWxpayByCondition" parameterType="MerchantWxpay">
+        update t_merchant_wxpay
+        set delFlag = '1'
+        <where>
+            <if test="wxPayId != null  and wxPayId != ''"> and wxPayId = #{wxPayId}</if>
+            <if test="wxMchId != null  and wxMchId != ''"> and wxMchId = #{wxMchId}</if>
+            <if test="wxSecret != null  and wxSecret != ''"> and wxSecret = #{wxSecret}</if>
+            <if test="wxApiV3key != null  and wxApiV3key != ''"> and wxApiV3key = #{wxApiV3key}</if>
+            <if test="wxCert != null  and wxCert != ''"> and wxCert = #{wxCert}</if>
+            <if test="wxCertFile != null  and wxCertFile != ''"> and wxCertFile = #{wxCertFile}</if>
+            <if test="wxKeyFile != null  and wxKeyFile != ''"> and wxKeyFile = #{wxKeyFile}</if>
+            <if test="delFlag != null  and delFlag != ''"> and delFlag = #{delFlag}</if>
+            <if test="createUser != null  and createUser != ''"> and createUser = #{createUser}</if>
+            <if test="createTime != null "> and createTime = #{createTime}</if>
+            <if test="updateUser != null  and updateUser != ''"> and updateUser = #{updateUser}</if>
+            <if test="updateTime != null "> and updateTime = #{updateTime}</if>
+        </where>
+    </update>
+</mapper>

08.src/Xingxi/xingxi-system/src/main/resources/mapper/business/NewProdMapper.xml

@@ -0,0 +1,132 @@
+<?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.xingxi.business.NewProd.mapper.NewProdMapper">
+    <resultMap type="NewProd" id="NewProdResult">
+        <result property="id"    column="id"    />
+        <result property="prodId"    column="prodId"    />
+        <result property="sort"    column="sort"    />
+        <result property="delFlag"    column="delFlag"    />
+        <result property="createUser"    column="createUser"    />
+        <result property="createTime"    column="createTime"    />
+        <result property="updateUser"    column="updateUser"    />
+        <result property="updateTime"    column="updateTime"    />
+    </resultMap>
+
+    <sql id="selectNewProd">
+        select id, prodId, sort, delFlag, createUser, createTime, updateUser, updateTime from t_new_prod
+    </sql>
+
+    <sql id="selectNewProdExt">
+        select
+            ${tableAlias}.id,
+            ${tableAlias}.prodId,
+            ${tableAlias}.sort,
+            ${tableAlias}.delFlag,
+            ${tableAlias}.createUser,
+            ${tableAlias}.createTime,
+            ${tableAlias}.updateUser,
+            ${tableAlias}.updateTime
+        from t_new_prod ${tableAlias}
+    </sql>
+
+    <select id="selectNewProdList" parameterType="NewProd" resultMap="NewProdResult">
+        <include refid="selectNewProd"/>
+        <where>
+            <if test="prodId != null "> and prodId = #{prodId}</if>
+            <if test="sort != null "> and sort = #{sort}</if>
+            <if test="delFlag != null  and delFlag != ''"> and delFlag = #{delFlag}</if>
+            <if test="createUser != null  and createUser != ''"> and createUser = #{createUser}</if>
+            <if test="createTime != null "> and createTime = #{createTime}</if>
+            <if test="updateUser != null  and updateUser != ''"> and updateUser = #{updateUser}</if>
+            <if test="updateTime != null "> and updateTime = #{updateTime}</if>
+        </where>
+    </select>
+
+    <select id="selectNewProdById" parameterType="Long" resultMap="NewProdResult">
+        <include refid="selectNewProd"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertNewProd" parameterType="NewProd" useGeneratedKeys="true" keyProperty="id">
+        insert into t_new_prod
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="prodId != null">prodId,</if>
+            <if test="sort != null">sort,</if>
+            <if test="delFlag != null">delFlag,</if>
+            <if test="createUser != null">createUser,</if>
+            <if test="createTime != null">createTime,</if>
+            <if test="updateUser != null">updateUser,</if>
+            <if test="updateTime != null">updateTime,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="prodId != null">#{prodId},</if>
+            <if test="sort != null">#{sort},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createUser != null">#{createUser},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateUser != null">#{updateUser},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+         </trim>
+    </insert>
+
+    <insert id="batchInsertNewProd">
+        insert into t_new_prod( prodId, sort, delFlag, createUser, createTime, updateUser, updateTime) values
+        <foreach item="item" index="index" collection="list" separator=",">
+            ( #{item.prodId}, #{item.sort}, #{item.delFlag}, #{item.createUser}, #{item.createTime}, #{item.updateUser}, #{item.updateTime})
+        </foreach>
+    </insert>
+
+    <update id="updateNewProd" parameterType="NewProd">
+        update t_new_prod
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="prodId != null">prodId = #{prodId},</if>
+            <if test="sort != null">sort = #{sort},</if>
+            <if test="delFlag != null">delFlag = #{delFlag},</if>
+            <if test="createUser != null">createUser = #{createUser},</if>
+            <if test="createTime != null">createTime = #{createTime},</if>
+            <if test="updateUser != null">updateUser = #{updateUser},</if>
+            <if test="updateTime != null">updateTime = #{updateTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteNewProdById" parameterType="Long">
+        delete from t_new_prod where id = #{id}
+    </delete>
+
+    <delete id="deleteNewProdByIds" parameterType="String">
+        delete from t_new_prod where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+    <update id="logicDeleteNewProdById" parameterType="Long">
+        update t_new_prod
+            set delFlag = '1'
+        where id = #{id}
+    </update>
+
+    <update id="logicDeleteNewProdByIds" parameterType="String">
+        update t_new_prod
+        set delFlag = '1'
+        where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+
+    <update id="logicDeleteNewProdByCondition" parameterType="NewProd">
+        update t_new_prod
+        set delFlag = '1'
+        <where>
+            <if test="prodId != null "> and prodId = #{prodId}</if>
+            <if test="sort != null "> and sort = #{sort}</if>
+            <if test="delFlag != null  and delFlag != ''"> and delFlag = #{delFlag}</if>
+            <if test="createUser != null  and createUser != ''"> and createUser = #{createUser}</if>
+            <if test="createTime != null "> and createTime = #{createTime}</if>
+            <if test="updateUser != null  and updateUser != ''"> and updateUser = #{updateUser}</if>
+            <if test="updateTime != null "> and updateTime = #{updateTime}</if>
+        </where>
+    </update>
+</mapper>

08.src/Xingxi/xingxi-system/src/main/resources/mapper/business/NewsMapper.xml

@@ -0,0 +1,125 @@
+<?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.xingxi.business.News.mapper.NewsMapper">
+    <resultMap type="News" id="NewsResult">
+        <result property="newsId"    column="newsId"    />
+        <result property="newsContext"    column="newsContext"    />
+        <result property="delFlag"    column="delFlag"    />
+        <result property="createUser"    column="createUser"    />
+        <result property="createTime"    column="createTime"    />
+        <result property="updateUser"    column="updateUser"    />
+        <result property="updateTime"    column="updateTime"    />
+    </resultMap>
+
+    <sql id="selectNews">
+        select newsId, newsContext, delFlag, createUser, createTime, updateUser, updateTime from t_news
+    </sql>
+
+    <sql id="selectNewsExt">
+        select
+            ${tableAlias}.newsId,
+            ${tableAlias}.newsContext,
+            ${tableAlias}.delFlag,
+            ${tableAlias}.createUser,
+            ${tableAlias}.createTime,
+            ${tableAlias}.updateUser,
+            ${tableAlias}.updateTime
+        from t_news ${tableAlias}
+    </sql>
+
+    <select id="selectNewsList" parameterType="News" resultMap="NewsResult">
+        <include refid="selectNews"/>
+        <where>  
+            <if test="newsContext != null  and newsContext != ''"> and newsContext = #{newsContext}</if>
+            <if test="delFlag != null  and delFlag != ''"> and delFlag = #{delFlag}</if>
+            <if test="createUser != null  and createUser != ''"> and createUser = #{createUser}</if>
+            <if test="createTime != null "> and createTime = #{createTime}</if>
+            <if test="updateUser != null  and updateUser != ''"> and updateUser = #{updateUser}</if>
+            <if test="updateTime != null "> and updateTime = #{updateTime}</if>
+        </where>
+    </select>
+    
+    <select id="selectNewsByNewsId" parameterType="Long" resultMap="NewsResult">
+        <include refid="selectNews"/>
+        where newsId = #{newsId}
+    </select>
+        
+    <insert id="insertNews" parameterType="News" useGeneratedKeys="true" keyProperty="newsId">
+        insert into t_news
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="newsContext != null">newsContext,</if>
+            <if test="delFlag != null">delFlag,</if>
+            <if test="createUser != null">createUser,</if>
+            <if test="createTime != null">createTime,</if>
+            <if test="updateUser != null">updateUser,</if>
+            <if test="updateTime != null">updateTime,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="newsContext != null">#{newsContext},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createUser != null">#{createUser},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateUser != null">#{updateUser},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+         </trim>
+    </insert>
+
+    <insert id="batchInsertNews">
+        insert into t_news( newsContext, delFlag, createUser, createTime, updateUser, updateTime) values
+        <foreach item="item" index="index" collection="list" separator=",">
+            ( #{item.newsContext}, #{item.delFlag}, #{item.createUser}, #{item.createTime}, #{item.updateUser}, #{item.updateTime})
+        </foreach>
+    </insert>
+
+    <update id="updateNews" parameterType="News">
+        update t_news
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="newsContext != null">newsContext = #{newsContext},</if>
+            <if test="delFlag != null">delFlag = #{delFlag},</if>
+            <if test="createUser != null">createUser = #{createUser},</if>
+            <if test="createTime != null">createTime = #{createTime},</if>
+            <if test="updateUser != null">updateUser = #{updateUser},</if>
+            <if test="updateTime != null">updateTime = #{updateTime},</if>
+        </trim>
+        where newsId = #{newsId}
+    </update>
+
+    <delete id="deleteNewsByNewsId" parameterType="Long">
+        delete from t_news where newsId = #{newsId}
+    </delete>
+
+    <delete id="deleteNewsByNewsIds" parameterType="String">
+        delete from t_news where newsId in 
+        <foreach item="newsId" collection="array" open="(" separator="," close=")">
+            #{newsId}
+        </foreach>
+    </delete>
+
+    <update id="logicDeleteNewsByNewsId" parameterType="Long">
+        update t_news
+            set delFlag = '1'
+        where newsId = #{newsId}
+    </update>
+
+    <update id="logicDeleteNewsByNewsIds" parameterType="String">
+        update t_news
+        set delFlag = '1'
+        where newsId in
+        <foreach item="newsId" collection="array" open="(" separator="," close=")">
+            #{newsId}
+        </foreach>
+    </update>
+
+    <update id="logicDeleteNewsByCondition" parameterType="News">
+        update t_news
+        set delFlag = '1'
+        <where>
+            <if test="newsContext != null  and newsContext != ''"> and newsContext = #{newsContext}</if>
+            <if test="delFlag != null  and delFlag != ''"> and delFlag = #{delFlag}</if>
+            <if test="createUser != null  and createUser != ''"> and createUser = #{createUser}</if>
+            <if test="createTime != null "> and createTime = #{createTime}</if>
+            <if test="updateUser != null  and updateUser != ''"> and updateUser = #{updateUser}</if>
+            <if test="updateTime != null "> and updateTime = #{updateTime}</if>
+        </where>
+    </update>
+</mapper>

08.src/Xingxi/xingxi-system/src/main/resources/mapper/business/NewsPicMapper.xml

@@ -0,0 +1,132 @@
+<?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.xingxi.business.NewsPic.mapper.NewsPicMapper">
+    <resultMap type="NewsPic" id="NewsPicResult">
+        <result property="id"    column="id"    />
+        <result property="newsUrl"    column="newsUrl"    />
+        <result property="newsId"    column="newsId"    />
+        <result property="delFlag"    column="delFlag"    />
+        <result property="createUser"    column="createUser"    />
+        <result property="createTime"    column="createTime"    />
+        <result property="updateUser"    column="updateUser"    />
+        <result property="updateTime"    column="updateTime"    />
+    </resultMap>
+
+    <sql id="selectNewsPic">
+        select id, newsUrl, newsId, delFlag, createUser, createTime, updateUser, updateTime from t_news_pic
+    </sql>
+
+    <sql id="selectNewsPicExt">
+        select
+            ${tableAlias}.id,
+            ${tableAlias}.newsUrl,
+            ${tableAlias}.newsId,
+            ${tableAlias}.delFlag,
+            ${tableAlias}.createUser,
+            ${tableAlias}.createTime,
+            ${tableAlias}.updateUser,
+            ${tableAlias}.updateTime
+        from t_news_pic ${tableAlias}
+    </sql>
+
+    <select id="selectNewsPicList" parameterType="NewsPic" resultMap="NewsPicResult">
+        <include refid="selectNewsPic"/>
+        <where>  
+            <if test="newsUrl != null  and newsUrl != ''"> and newsUrl = #{newsUrl}</if>
+            <if test="newsId != null "> and newsId = #{newsId}</if>
+            <if test="delFlag != null  and delFlag != ''"> and delFlag = #{delFlag}</if>
+            <if test="createUser != null  and createUser != ''"> and createUser = #{createUser}</if>
+            <if test="createTime != null "> and createTime = #{createTime}</if>
+            <if test="updateUser != null  and updateUser != ''"> and updateUser = #{updateUser}</if>
+            <if test="updateTime != null "> and updateTime = #{updateTime}</if>
+        </where>
+    </select>
+    
+    <select id="selectNewsPicById" parameterType="Long" resultMap="NewsPicResult">
+        <include refid="selectNewsPic"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertNewsPic" parameterType="NewsPic" useGeneratedKeys="true" keyProperty="id">
+        insert into t_news_pic
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="newsUrl != null">newsUrl,</if>
+            <if test="newsId != null">newsId,</if>
+            <if test="delFlag != null">delFlag,</if>
+            <if test="createUser != null">createUser,</if>
+            <if test="createTime != null">createTime,</if>
+            <if test="updateUser != null">updateUser,</if>
+            <if test="updateTime != null">updateTime,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="newsUrl != null">#{newsUrl},</if>
+            <if test="newsId != null">#{newsId},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createUser != null">#{createUser},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateUser != null">#{updateUser},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+         </trim>
+    </insert>
+
+    <insert id="batchInsertNewsPic">
+        insert into t_news_pic( newsUrl, newsId, delFlag, createUser, createTime, updateUser, updateTime) values
+        <foreach item="item" index="index" collection="list" separator=",">
+            ( #{item.newsUrl}, #{item.newsId}, #{item.delFlag}, #{item.createUser}, #{item.createTime}, #{item.updateUser}, #{item.updateTime})
+        </foreach>
+    </insert>
+
+    <update id="updateNewsPic" parameterType="NewsPic">
+        update t_news_pic
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="newsUrl != null">newsUrl = #{newsUrl},</if>
+            <if test="newsId != null">newsId = #{newsId},</if>
+            <if test="delFlag != null">delFlag = #{delFlag},</if>
+            <if test="createUser != null">createUser = #{createUser},</if>
+            <if test="createTime != null">createTime = #{createTime},</if>
+            <if test="updateUser != null">updateUser = #{updateUser},</if>
+            <if test="updateTime != null">updateTime = #{updateTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteNewsPicById" parameterType="Long">
+        delete from t_news_pic where id = #{id}
+    </delete>
+
+    <delete id="deleteNewsPicByIds" parameterType="String">
+        delete from t_news_pic where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+    <update id="logicDeleteNewsPicById" parameterType="Long">
+        update t_news_pic
+            set delFlag = '1'
+        where id = #{id}
+    </update>
+
+    <update id="logicDeleteNewsPicByIds" parameterType="String">
+        update t_news_pic
+        set delFlag = '1'
+        where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+
+    <update id="logicDeleteNewsPicByCondition" parameterType="NewsPic">
+        update t_news_pic
+        set delFlag = '1'
+        <where>
+            <if test="newsUrl != null  and newsUrl != ''"> and newsUrl = #{newsUrl}</if>
+            <if test="newsId != null "> and newsId = #{newsId}</if>
+            <if test="delFlag != null  and delFlag != ''"> and delFlag = #{delFlag}</if>
+            <if test="createUser != null  and createUser != ''"> and createUser = #{createUser}</if>
+            <if test="createTime != null "> and createTime = #{createTime}</if>
+            <if test="updateUser != null  and updateUser != ''"> and updateUser = #{updateUser}</if>
+            <if test="updateTime != null "> and updateTime = #{updateTime}</if>
+        </where>
+    </update>
+</mapper>

08.src/Xingxi/xingxi-system/src/main/resources/mapper/business/OrderDeliveryExprMapper.xml

@@ -0,0 +1,153 @@
+<?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.xingxi.business.Order.mapper.OrderDeliveryExprMapper">
+    <resultMap type="OrderDeliveryExpr" id="OrderDeliveryExprResult">
+        <result property="id"    column="id"    />
+        <result property="orderDetailId"    column="orderDetailId"    />
+        <result property="orderDeliveryId"    column="orderDeliveryId"    />
+        <result property="expressNo"    column="expressNo"    />
+        <result property="deliveryTime"    column="deliveryTime"    />
+        <result property="confirmTime"    column="confirmTime"    />
+        <result property="delFlag"    column="delFlag"    />
+        <result property="createUser"    column="createUser"    />
+        <result property="createTime"    column="createTime"    />
+        <result property="updateUser"    column="updateUser"    />
+        <result property="updateTime"    column="updateTime"    />
+    </resultMap>
+
+    <sql id="selectOrderDeliveryExpr">
+        select id, orderDetailId, orderDeliveryId, expressNo, deliveryTime, confirmTime, delFlag, createUser, createTime, updateUser, updateTime from t_order_delivery_expr
+    </sql>
+
+    <sql id="selectOrderDeliveryExprExt">
+        select
+            ${tableAlias}.id,
+            ${tableAlias}.orderDetailId,
+            ${tableAlias}.orderDeliveryId,
+            ${tableAlias}.expressNo,
+            ${tableAlias}.deliveryTime,
+            ${tableAlias}.confirmTime,
+            ${tableAlias}.delFlag,
+            ${tableAlias}.createUser,
+            ${tableAlias}.createTime,
+            ${tableAlias}.updateUser,
+            ${tableAlias}.updateTime
+        from t_order_delivery_expr ${tableAlias}
+    </sql>
+
+    <select id="selectOrderDeliveryExprList" parameterType="OrderDeliveryExpr" resultMap="OrderDeliveryExprResult">
+        <include refid="selectOrderDeliveryExpr"/>
+        <where>  
+            <if test="orderDetailId != null "> and orderDetailId = #{orderDetailId}</if>
+            <if test="orderDeliveryId != null "> and orderDeliveryId = #{orderDeliveryId}</if>
+            <if test="expressNo != null  and expressNo != ''"> and expressNo = #{expressNo}</if>
+            <if test="deliveryTime != null "> and deliveryTime = #{deliveryTime}</if>
+            <if test="confirmTime != null "> and confirmTime = #{confirmTime}</if>
+            <if test="delFlag != null  and delFlag != ''"> and delFlag = #{delFlag}</if>
+            <if test="createUser != null  and createUser != ''"> and createUser = #{createUser}</if>
+            <if test="createTime != null "> and createTime = #{createTime}</if>
+            <if test="updateUser != null  and updateUser != ''"> and updateUser = #{updateUser}</if>
+            <if test="updateTime != null "> and updateTime = #{updateTime}</if>
+        </where>
+    </select>
+    
+    <select id="selectOrderDeliveryExprById" parameterType="Long" resultMap="OrderDeliveryExprResult">
+        <include refid="selectOrderDeliveryExpr"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertOrderDeliveryExpr" parameterType="OrderDeliveryExpr" useGeneratedKeys="true" keyProperty="id">
+        insert into t_order_delivery_expr
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="orderDetailId != null">orderDetailId,</if>
+            <if test="orderDeliveryId != null">orderDeliveryId,</if>
+            <if test="expressNo != null">expressNo,</if>
+            <if test="deliveryTime != null">deliveryTime,</if>
+            <if test="confirmTime != null">confirmTime,</if>
+            <if test="delFlag != null">delFlag,</if>
+            <if test="createUser != null">createUser,</if>
+            <if test="createTime != null">createTime,</if>
+            <if test="updateUser != null">updateUser,</if>
+            <if test="updateTime != null">updateTime,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="orderDetailId != null">#{orderDetailId},</if>
+            <if test="orderDeliveryId != null">#{orderDeliveryId},</if>
+            <if test="expressNo != null">#{expressNo},</if>
+            <if test="deliveryTime != null">#{deliveryTime},</if>
+            <if test="confirmTime != null">#{confirmTime},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createUser != null">#{createUser},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateUser != null">#{updateUser},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+         </trim>
+    </insert>
+
+    <insert id="batchInsertOrderDeliveryExpr">
+        insert into t_order_delivery_expr( orderDetailId, orderDeliveryId, expressNo, deliveryTime, confirmTime, delFlag, createUser, createTime, updateUser, updateTime) values
+        <foreach item="item" index="index" collection="list" separator=",">
+            ( #{item.orderDetailId}, #{item.orderDeliveryId}, #{item.expressNo}, #{item.deliveryTime}, #{item.confirmTime}, #{item.delFlag}, #{item.createUser}, #{item.createTime}, #{item.updateUser}, #{item.updateTime})
+        </foreach>
+    </insert>
+
+    <update id="updateOrderDeliveryExpr" parameterType="OrderDeliveryExpr">
+        update t_order_delivery_expr
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="orderDetailId != null">orderDetailId = #{orderDetailId},</if>
+            <if test="orderDeliveryId != null">orderDeliveryId = #{orderDeliveryId},</if>
+            <if test="expressNo != null">expressNo = #{expressNo},</if>
+            <if test="deliveryTime != null">deliveryTime = #{deliveryTime},</if>
+            <if test="confirmTime != null">confirmTime = #{confirmTime},</if>
+            <if test="delFlag != null">delFlag = #{delFlag},</if>
+            <if test="createUser != null">createUser = #{createUser},</if>
+            <if test="createTime != null">createTime = #{createTime},</if>
+            <if test="updateUser != null">updateUser = #{updateUser},</if>
+            <if test="updateTime != null">updateTime = #{updateTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteOrderDeliveryExprById" parameterType="Long">
+        delete from t_order_delivery_expr where id = #{id}
+    </delete>
+
+    <delete id="deleteOrderDeliveryExprByIds" parameterType="String">
+        delete from t_order_delivery_expr where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+    <update id="logicDeleteOrderDeliveryExprById" parameterType="Long">
+        update t_order_delivery_expr
+            set delFlag = '1'
+        where id = #{id}
+    </update>
+
+    <update id="logicDeleteOrderDeliveryExprByIds" parameterType="String">
+        update t_order_delivery_expr
+        set delFlag = '1'
+        where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+
+    <update id="logicDeleteOrderDeliveryExprByCondition" parameterType="OrderDeliveryExpr">
+        update t_order_delivery_expr
+        set delFlag = '1'
+        <where>
+            <if test="orderDetailId != null "> and orderDetailId = #{orderDetailId}</if>
+            <if test="orderDeliveryId != null "> and orderDeliveryId = #{orderDeliveryId}</if>
+            <if test="expressNo != null  and expressNo != ''"> and expressNo = #{expressNo}</if>
+            <if test="deliveryTime != null "> and deliveryTime = #{deliveryTime}</if>
+            <if test="confirmTime != null "> and confirmTime = #{confirmTime}</if>
+            <if test="delFlag != null  and delFlag != ''"> and delFlag = #{delFlag}</if>
+            <if test="createUser != null  and createUser != ''"> and createUser = #{createUser}</if>
+            <if test="createTime != null "> and createTime = #{createTime}</if>
+            <if test="updateUser != null  and updateUser != ''"> and updateUser = #{updateUser}</if>
+            <if test="updateTime != null "> and updateTime = #{updateTime}</if>
+        </where>
+    </update>
+</mapper>

08.src/Xingxi/xingxi-system/src/main/resources/mapper/business/OrderDeliveryMapper.xml

@@ -0,0 +1,181 @@
+<?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.xingxi.business.Order.mapper.OrderDeliveryMapper">
+    <resultMap type="OrderDelivery" id="OrderDeliveryResult">
+        <result property="orderDeliveryId"    column="orderDeliveryId"    />
+        <result property="orderId"    column="orderId"    />
+        <result property="orderDetailId"    column="orderDetailId"    />
+        <result property="orderDeliveryStatus"    column="orderDeliveryStatus"    />
+        <result property="prodId"    column="prodId"    />
+        <result property="prodName"    column="prodName"    />
+        <result property="prodAttrId"    column="prodAttrId"    />
+        <result property="prodAttrName"    column="prodAttrName"    />
+        <result property="vendorId"    column="vendorId"    />
+        <result property="quantity"    column="quantity"    />
+        <result property="delFlag"    column="delFlag"    />
+        <result property="createUser"    column="createUser"    />
+        <result property="createTime"    column="createTime"    />
+        <result property="updateUser"    column="updateUser"    />
+        <result property="updateTime"    column="updateTime"    />
+    </resultMap>
+
+    <sql id="selectOrderDelivery">
+        select orderDeliveryId, orderId, orderDetailId, orderDeliveryStatus, prodId, prodName, prodAttrId, prodAttrName, vendorId, quantity, delFlag, createUser, createTime, updateUser, updateTime from t_order_delivery
+    </sql>
+
+    <sql id="selectOrderDeliveryExt">
+        select
+            ${tableAlias}.orderDeliveryId,
+            ${tableAlias}.orderId,
+            ${tableAlias}.orderDetailId,
+            ${tableAlias}.orderDeliveryStatus,
+            ${tableAlias}.prodId,
+            ${tableAlias}.prodName,
+            ${tableAlias}.prodAttrId,
+            ${tableAlias}.prodAttrName,
+            ${tableAlias}.vendorId,
+            ${tableAlias}.quantity,
+            ${tableAlias}.delFlag,
+            ${tableAlias}.createUser,
+            ${tableAlias}.createTime,
+            ${tableAlias}.updateUser,
+            ${tableAlias}.updateTime
+        from t_order_delivery ${tableAlias}
+    </sql>
+
+    <select id="selectOrderDeliveryList" parameterType="OrderDelivery" resultMap="OrderDeliveryResult">
+        <include refid="selectOrderDelivery"/>
+        <where>  
+            <if test="orderId != null "> and orderId = #{orderId}</if>
+            <if test="orderDetailId != null "> and orderDetailId = #{orderDetailId}</if>
+            <if test="orderDeliveryStatus != null  and orderDeliveryStatus != ''"> and orderDeliveryStatus = #{orderDeliveryStatus}</if>
+            <if test="prodId != null "> and prodId = #{prodId}</if>
+            <if test="prodName != null  and prodName != ''"> and prodName like concat('%', #{prodName}, '%')</if>
+            <if test="prodAttrId != null "> and prodAttrId = #{prodAttrId}</if>
+            <if test="prodAttrName != null  and prodAttrName != ''"> and prodAttrName like concat('%', #{prodAttrName}, '%')</if>
+            <if test="vendorId != null "> and vendorId = #{vendorId}</if>
+            <if test="quantity != null "> and quantity = #{quantity}</if>
+            <if test="delFlag != null  and delFlag != ''"> and delFlag = #{delFlag}</if>
+            <if test="createUser != null  and createUser != ''"> and createUser = #{createUser}</if>
+            <if test="createTime != null "> and createTime = #{createTime}</if>
+            <if test="updateUser != null  and updateUser != ''"> and updateUser = #{updateUser}</if>
+            <if test="updateTime != null "> and updateTime = #{updateTime}</if>
+        </where>
+    </select>
+    
+    <select id="selectOrderDeliveryByOrderDeliveryId" parameterType="Long" resultMap="OrderDeliveryResult">
+        <include refid="selectOrderDelivery"/>
+        where orderDeliveryId = #{orderDeliveryId}
+    </select>
+        
+    <insert id="insertOrderDelivery" parameterType="OrderDelivery" useGeneratedKeys="true" keyProperty="orderDeliveryId">
+        insert into t_order_delivery
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="orderId != null">orderId,</if>
+            <if test="orderDetailId != null">orderDetailId,</if>
+            <if test="orderDeliveryStatus != null">orderDeliveryStatus,</if>
+            <if test="prodId != null">prodId,</if>
+            <if test="prodName != null">prodName,</if>
+            <if test="prodAttrId != null">prodAttrId,</if>
+            <if test="prodAttrName != null">prodAttrName,</if>
+            <if test="vendorId != null">vendorId,</if>
+            <if test="quantity != null">quantity,</if>
+            <if test="delFlag != null">delFlag,</if>
+            <if test="createUser != null">createUser,</if>
+            <if test="createTime != null">createTime,</if>
+            <if test="updateUser != null">updateUser,</if>
+            <if test="updateTime != null">updateTime,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="orderId != null">#{orderId},</if>
+            <if test="orderDetailId != null">#{orderDetailId},</if>
+            <if test="orderDeliveryStatus != null">#{orderDeliveryStatus},</if>
+            <if test="prodId != null">#{prodId},</if>
+            <if test="prodName != null">#{prodName},</if>
+            <if test="prodAttrId != null">#{prodAttrId},</if>
+            <if test="prodAttrName != null">#{prodAttrName},</if>
+            <if test="vendorId != null">#{vendorId},</if>
+            <if test="quantity != null">#{quantity},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createUser != null">#{createUser},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateUser != null">#{updateUser},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+         </trim>
+    </insert>
+
+    <insert id="batchInsertOrderDelivery">
+        insert into t_order_delivery( orderId, orderDetailId, orderDeliveryStatus, prodId, prodName, prodAttrId, prodAttrName, vendorId, quantity, delFlag, createUser, createTime, updateUser, updateTime) values
+        <foreach item="item" index="index" collection="list" separator=",">
+            ( #{item.orderId}, #{item.orderDetailId}, #{item.orderDeliveryStatus}, #{item.prodId}, #{item.prodName}, #{item.prodAttrId}, #{item.prodAttrName}, #{item.vendorId}, #{item.quantity}, #{item.delFlag}, #{item.createUser}, #{item.createTime}, #{item.updateUser}, #{item.updateTime})
+        </foreach>
+    </insert>
+
+    <update id="updateOrderDelivery" parameterType="OrderDelivery">
+        update t_order_delivery
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="orderId != null">orderId = #{orderId},</if>
+            <if test="orderDetailId != null">orderDetailId = #{orderDetailId},</if>
+            <if test="orderDeliveryStatus != null">orderDeliveryStatus = #{orderDeliveryStatus},</if>
+            <if test="prodId != null">prodId = #{prodId},</if>
+            <if test="prodName != null">prodName = #{prodName},</if>
+            <if test="prodAttrId != null">prodAttrId = #{prodAttrId},</if>
+            <if test="prodAttrName != null">prodAttrName = #{prodAttrName},</if>
+            <if test="vendorId != null">vendorId = #{vendorId},</if>
+            <if test="quantity != null">quantity = #{quantity},</if>
+            <if test="delFlag != null">delFlag = #{delFlag},</if>
+            <if test="createUser != null">createUser = #{createUser},</if>
+            <if test="createTime != null">createTime = #{createTime},</if>
+            <if test="updateUser != null">updateUser = #{updateUser},</if>
+            <if test="updateTime != null">updateTime = #{updateTime},</if>
+        </trim>
+        where orderDeliveryId = #{orderDeliveryId}
+    </update>
+
+    <delete id="deleteOrderDeliveryByOrderDeliveryId" parameterType="Long">
+        delete from t_order_delivery where orderDeliveryId = #{orderDeliveryId}
+    </delete>
+
+    <delete id="deleteOrderDeliveryByOrderDeliveryIds" parameterType="String">
+        delete from t_order_delivery where orderDeliveryId in 
+        <foreach item="orderDeliveryId" collection="array" open="(" separator="," close=")">
+            #{orderDeliveryId}
+        </foreach>
+    </delete>
+
+    <update id="logicDeleteOrderDeliveryByOrderDeliveryId" parameterType="Long">
+        update t_order_delivery
+            set delFlag = '1'
+        where orderDeliveryId = #{orderDeliveryId}
+    </update>
+
+    <update id="logicDeleteOrderDeliveryByOrderDeliveryIds" parameterType="String">
+        update t_order_delivery
+        set delFlag = '1'
+        where orderDeliveryId in
+        <foreach item="orderDeliveryId" collection="array" open="(" separator="," close=")">
+            #{orderDeliveryId}
+        </foreach>
+    </update>
+
+    <update id="logicDeleteOrderDeliveryByCondition" parameterType="OrderDelivery">
+        update t_order_delivery
+        set delFlag = '1'
+        <where>
+            <if test="orderId != null "> and orderId = #{orderId}</if>
+            <if test="orderDetailId != null "> and orderDetailId = #{orderDetailId}</if>
+            <if test="orderDeliveryStatus != null  and orderDeliveryStatus != ''"> and orderDeliveryStatus = #{orderDeliveryStatus}</if>
+            <if test="prodId != null "> and prodId = #{prodId}</if>
+            <if test="prodName != null  and prodName != ''"> and prodName like concat('%', #{prodName}, '%')</if>
+            <if test="prodAttrId != null "> and prodAttrId = #{prodAttrId}</if>
+            <if test="prodAttrName != null  and prodAttrName != ''"> and prodAttrName like concat('%', #{prodAttrName}, '%')</if>
+            <if test="vendorId != null "> and vendorId = #{vendorId}</if>
+            <if test="quantity != null "> and quantity = #{quantity}</if>
+            <if test="delFlag != null  and delFlag != ''"> and delFlag = #{delFlag}</if>
+            <if test="createUser != null  and createUser != ''"> and createUser = #{createUser}</if>
+            <if test="createTime != null "> and createTime = #{createTime}</if>
+            <if test="updateUser != null  and updateUser != ''"> and updateUser = #{updateUser}</if>
+            <if test="updateTime != null "> and updateTime = #{updateTime}</if>
+        </where>
+    </update>
+</mapper>

08.src/Xingxi/xingxi-system/src/main/resources/mapper/business/OrderDetailMapper.xml

@@ -0,0 +1,209 @@
+<?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.xingxi.business.Order.mapper.OrderDetailMapper">
+    <resultMap type="OrderDetail" id="OrderDetailResult">
+        <result property="orderDetailId"    column="orderDetailId"    />
+        <result property="orderId"    column="orderId"    />
+        <result property="orderDetailStatus"    column="orderDetailStatus"    />
+        <result property="prodId"    column="prodId"    />
+        <result property="prodName"    column="prodName"    />
+        <result property="prodAttrId"    column="prodAttrId"    />
+        <result property="prodAttrName"    column="prodAttrName"    />
+        <result property="vendorId"    column="vendorId"    />
+        <result property="quantity"    column="quantity"    />
+        <result property="afterSalesQty"    column="afterSalesQty"    />
+        <result property="refundQty"    column="refundQty"    />
+        <result property="price"    column="price"    />
+        <result property="orderAmount"    column="orderAmount"    />
+        <result property="payAmount"    column="payAmount"    />
+        <result property="delFlag"    column="delFlag"    />
+        <result property="createUser"    column="createUser"    />
+        <result property="createTime"    column="createTime"    />
+        <result property="updateUser"    column="updateUser"    />
+        <result property="updateTime"    column="updateTime"    />
+    </resultMap>
+
+    <sql id="selectOrderDetail">
+        select orderDetailId, orderId, orderDetailStatus, prodId, prodName, prodAttrId, prodAttrName, vendorId, quantity, afterSalesQty, refundQty, price, orderAmount, payAmount, delFlag, createUser, createTime, updateUser, updateTime from t_order_detail
+    </sql>
+
+    <sql id="selectOrderDetailExt">
+        select
+            ${tableAlias}.orderDetailId,
+            ${tableAlias}.orderId,
+            ${tableAlias}.orderDetailStatus,
+            ${tableAlias}.prodId,
+            ${tableAlias}.prodName,
+            ${tableAlias}.prodAttrId,
+            ${tableAlias}.prodAttrName,
+            ${tableAlias}.vendorId,
+            ${tableAlias}.quantity,
+            ${tableAlias}.afterSalesQty,
+            ${tableAlias}.refundQty,
+            ${tableAlias}.price,
+            ${tableAlias}.orderAmount,
+            ${tableAlias}.payAmount,
+            ${tableAlias}.delFlag,
+            ${tableAlias}.createUser,
+            ${tableAlias}.createTime,
+            ${tableAlias}.updateUser,
+            ${tableAlias}.updateTime
+        from t_order_detail ${tableAlias}
+    </sql>
+
+    <select id="selectOrderDetailList" parameterType="OrderDetail" resultMap="OrderDetailResult">
+        <include refid="selectOrderDetail"/>
+        <where>  
+            <if test="orderId != null "> and orderId = #{orderId}</if>
+            <if test="orderDetailStatus != null  and orderDetailStatus != ''"> and orderDetailStatus = #{orderDetailStatus}</if>
+            <if test="prodId != null "> and prodId = #{prodId}</if>
+            <if test="prodName != null  and prodName != ''"> and prodName like concat('%', #{prodName}, '%')</if>
+            <if test="prodAttrId != null "> and prodAttrId = #{prodAttrId}</if>
+            <if test="prodAttrName != null  and prodAttrName != ''"> and prodAttrName like concat('%', #{prodAttrName}, '%')</if>
+            <if test="vendorId != null "> and vendorId = #{vendorId}</if>
+            <if test="quantity != null "> and quantity = #{quantity}</if>
+            <if test="afterSalesQty != null "> and afterSalesQty = #{afterSalesQty}</if>
+            <if test="refundQty != null "> and refundQty = #{refundQty}</if>
+            <if test="price != null "> and price = #{price}</if>
+            <if test="orderAmount != null "> and orderAmount = #{orderAmount}</if>
+            <if test="payAmount != null "> and payAmount = #{payAmount}</if>
+            <if test="delFlag != null  and delFlag != ''"> and delFlag = #{delFlag}</if>
+            <if test="createUser != null  and createUser != ''"> and createUser = #{createUser}</if>
+            <if test="createTime != null "> and createTime = #{createTime}</if>
+            <if test="updateUser != null  and updateUser != ''"> and updateUser = #{updateUser}</if>
+            <if test="updateTime != null "> and updateTime = #{updateTime}</if>
+        </where>
+    </select>
+    
+    <select id="selectOrderDetailByOrderDetailId" parameterType="Long" resultMap="OrderDetailResult">
+        <include refid="selectOrderDetail"/>
+        where orderDetailId = #{orderDetailId}
+    </select>
+        
+    <insert id="insertOrderDetail" parameterType="OrderDetail" useGeneratedKeys="true" keyProperty="orderDetailId">
+        insert into t_order_detail
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="orderId != null">orderId,</if>
+            <if test="orderDetailStatus != null">orderDetailStatus,</if>
+            <if test="prodId != null">prodId,</if>
+            <if test="prodName != null">prodName,</if>
+            <if test="prodAttrId != null">prodAttrId,</if>
+            <if test="prodAttrName != null">prodAttrName,</if>
+            <if test="vendorId != null">vendorId,</if>
+            <if test="quantity != null">quantity,</if>
+            <if test="afterSalesQty != null">afterSalesQty,</if>
+            <if test="refundQty != null">refundQty,</if>
+            <if test="price != null">price,</if>
+            <if test="orderAmount != null">orderAmount,</if>
+            <if test="payAmount != null">payAmount,</if>
+            <if test="delFlag != null">delFlag,</if>
+            <if test="createUser != null">createUser,</if>
+            <if test="createTime != null">createTime,</if>
+            <if test="updateUser != null">updateUser,</if>
+            <if test="updateTime != null">updateTime,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="orderId != null">#{orderId},</if>
+            <if test="orderDetailStatus != null">#{orderDetailStatus},</if>
+            <if test="prodId != null">#{prodId},</if>
+            <if test="prodName != null">#{prodName},</if>
+            <if test="prodAttrId != null">#{prodAttrId},</if>
+            <if test="prodAttrName != null">#{prodAttrName},</if>
+            <if test="vendorId != null">#{vendorId},</if>
+            <if test="quantity != null">#{quantity},</if>
+            <if test="afterSalesQty != null">#{afterSalesQty},</if>
+            <if test="refundQty != null">#{refundQty},</if>
+            <if test="price != null">#{price},</if>
+            <if test="orderAmount != null">#{orderAmount},</if>
+            <if test="payAmount != null">#{payAmount},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createUser != null">#{createUser},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateUser != null">#{updateUser},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+         </trim>
+    </insert>
+
+    <insert id="batchInsertOrderDetail">
+        insert into t_order_detail( orderId, orderDetailStatus, prodId, prodName, prodAttrId, prodAttrName, vendorId, quantity, afterSalesQty, refundQty, price, orderAmount, payAmount, delFlag, createUser, createTime, updateUser, updateTime) values
+        <foreach item="item" index="index" collection="list" separator=",">
+            ( #{item.orderId}, #{item.orderDetailStatus}, #{item.prodId}, #{item.prodName}, #{item.prodAttrId}, #{item.prodAttrName}, #{item.vendorId}, #{item.quantity}, #{item.afterSalesQty}, #{item.refundQty}, #{item.price}, #{item.orderAmount}, #{item.payAmount}, #{item.delFlag}, #{item.createUser}, #{item.createTime}, #{item.updateUser}, #{item.updateTime})
+        </foreach>
+    </insert>
+
+    <update id="updateOrderDetail" parameterType="OrderDetail">
+        update t_order_detail
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="orderId != null">orderId = #{orderId},</if>
+            <if test="orderDetailStatus != null">orderDetailStatus = #{orderDetailStatus},</if>
+            <if test="prodId != null">prodId = #{prodId},</if>
+            <if test="prodName != null">prodName = #{prodName},</if>
+            <if test="prodAttrId != null">prodAttrId = #{prodAttrId},</if>
+            <if test="prodAttrName != null">prodAttrName = #{prodAttrName},</if>
+            <if test="vendorId != null">vendorId = #{vendorId},</if>
+            <if test="quantity != null">quantity = #{quantity},</if>
+            <if test="afterSalesQty != null">afterSalesQty = #{afterSalesQty},</if>
+            <if test="refundQty != null">refundQty = #{refundQty},</if>
+            <if test="price != null">price = #{price},</if>
+            <if test="orderAmount != null">orderAmount = #{orderAmount},</if>
+            <if test="payAmount != null">payAmount = #{payAmount},</if>
+            <if test="delFlag != null">delFlag = #{delFlag},</if>
+            <if test="createUser != null">createUser = #{createUser},</if>
+            <if test="createTime != null">createTime = #{createTime},</if>
+            <if test="updateUser != null">updateUser = #{updateUser},</if>
+            <if test="updateTime != null">updateTime = #{updateTime},</if>
+        </trim>
+        where orderDetailId = #{orderDetailId}
+    </update>
+
+    <delete id="deleteOrderDetailByOrderDetailId" parameterType="Long">
+        delete from t_order_detail where orderDetailId = #{orderDetailId}
+    </delete>
+
+    <delete id="deleteOrderDetailByOrderDetailIds" parameterType="String">
+        delete from t_order_detail where orderDetailId in 
+        <foreach item="orderDetailId" collection="array" open="(" separator="," close=")">
+            #{orderDetailId}
+        </foreach>
+    </delete>
+
+    <update id="logicDeleteOrderDetailByOrderDetailId" parameterType="Long">
+        update t_order_detail
+            set delFlag = '1'
+        where orderDetailId = #{orderDetailId}
+    </update>
+
+    <update id="logicDeleteOrderDetailByOrderDetailIds" parameterType="String">
+        update t_order_detail
+        set delFlag = '1'
+        where orderDetailId in
+        <foreach item="orderDetailId" collection="array" open="(" separator="," close=")">
+            #{orderDetailId}
+        </foreach>
+    </update>
+
+    <update id="logicDeleteOrderDetailByCondition" parameterType="OrderDetail">
+        update t_order_detail
+        set delFlag = '1'
+        <where>
+            <if test="orderId != null "> and orderId = #{orderId}</if>
+            <if test="orderDetailStatus != null  and orderDetailStatus != ''"> and orderDetailStatus = #{orderDetailStatus}</if>
+            <if test="prodId != null "> and prodId = #{prodId}</if>
+            <if test="prodName != null  and prodName != ''"> and prodName like concat('%', #{prodName}, '%')</if>
+            <if test="prodAttrId != null "> and prodAttrId = #{prodAttrId}</if>
+            <if test="prodAttrName != null  and prodAttrName != ''"> and prodAttrName like concat('%', #{prodAttrName}, '%')</if>
+            <if test="vendorId != null "> and vendorId = #{vendorId}</if>
+            <if test="quantity != null "> and quantity = #{quantity}</if>
+            <if test="afterSalesQty != null "> and afterSalesQty = #{afterSalesQty}</if>
+            <if test="refundQty != null "> and refundQty = #{refundQty}</if>
+            <if test="price != null "> and price = #{price}</if>
+            <if test="orderAmount != null "> and orderAmount = #{orderAmount}</if>
+            <if test="payAmount != null "> and payAmount = #{payAmount}</if>
+            <if test="delFlag != null  and delFlag != ''"> and delFlag = #{delFlag}</if>
+            <if test="createUser != null  and createUser != ''"> and createUser = #{createUser}</if>
+            <if test="createTime != null "> and createTime = #{createTime}</if>
+            <if test="updateUser != null  and updateUser != ''"> and updateUser = #{updateUser}</if>
+            <if test="updateTime != null "> and updateTime = #{updateTime}</if>
+        </where>
+    </update>
+</mapper>

08.src/Xingxi/xingxi-system/src/main/resources/mapper/business/OrderMapper.xml

@@ -0,0 +1,235 @@
+<?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.xingxi.business.Order.mapper.OrderMapper">
+    <resultMap type="Order" id="OrderResult">
+        <result property="orderId"    column="orderId"    />
+        <result property="orderNo"    column="orderNo"    />
+        <result property="orderTime"    column="orderTime"    />
+        <result property="payTime"    column="payTime"    />
+        <result property="orderStatus"    column="orderStatus"    />
+        <result property="orderAmount"    column="orderAmount"    />
+        <result property="payAmount"    column="payAmount"    />
+        <result property="buyerId"    column="buyerId"    />
+        <result property="sellerId"    column="sellerId"    />
+        <result property="cancelTime"    column="cancelTime"    />
+        <result property="finishTime"    column="finishTime"    />
+        <result property="recProv"    column="recProv"    />
+        <result property="recCity"    column="recCity"    />
+        <result property="recDistrict"    column="recDistrict"    />
+        <result property="recAddress"    column="recAddress"    />
+        <result property="recName"    column="recName"    />
+        <result property="recMobile"    column="recMobile"    />
+        <result property="remark"    column="remark"    />
+        <result property="delFlag"    column="delFlag"    />
+        <result property="createUser"    column="createUser"    />
+        <result property="createTime"    column="createTime"    />
+        <result property="updateUser"    column="updateUser"    />
+        <result property="updateTime"    column="updateTime"    />
+    </resultMap>
+
+    <sql id="selectOrder">
+        select orderId, orderNo, orderTime, payTime, orderStatus, orderAmount, payAmount, buyerId, sellerId, cancelTime, finishTime, recProv, recCity, recDistrict, recAddress, recName, recMobile, remark, delFlag, createUser, createTime, updateUser, updateTime from t_order
+    </sql>
+
+    <sql id="selectOrderExt">
+        select
+            ${tableAlias}.orderId,
+            ${tableAlias}.orderNo,
+            ${tableAlias}.orderTime,
+            ${tableAlias}.payTime,
+            ${tableAlias}.orderStatus,
+            ${tableAlias}.orderAmount,
+            ${tableAlias}.payAmount,
+            ${tableAlias}.buyerId,
+            ${tableAlias}.sellerId,
+            ${tableAlias}.cancelTime,
+            ${tableAlias}.finishTime,
+            ${tableAlias}.recProv,
+            ${tableAlias}.recCity,
+            ${tableAlias}.recDistrict,
+            ${tableAlias}.recAddress,
+            ${tableAlias}.recName,
+            ${tableAlias}.recMobile,
+            ${tableAlias}.remark,
+            ${tableAlias}.delFlag,
+            ${tableAlias}.createUser,
+            ${tableAlias}.createTime,
+            ${tableAlias}.updateUser,
+            ${tableAlias}.updateTime
+        from t_order ${tableAlias}
+    </sql>
+
+    <select id="selectOrderList" parameterType="Order" resultMap="OrderResult">
+        <include refid="selectOrder"/>
+        <where>  
+            <if test="orderNo != null  and orderNo != ''"> and orderNo = #{orderNo}</if>
+            <if test="orderTime != null "> and orderTime = #{orderTime}</if>
+            <if test="payTime != null  and payTime != ''"> and payTime = #{payTime}</if>
+            <if test="orderStatus != null  and orderStatus != ''"> and orderStatus = #{orderStatus}</if>
+            <if test="orderAmount != null "> and orderAmount = #{orderAmount}</if>
+            <if test="payAmount != null "> and payAmount = #{payAmount}</if>
+            <if test="buyerId != null "> and buyerId = #{buyerId}</if>
+            <if test="sellerId != null "> and sellerId = #{sellerId}</if>
+            <if test="cancelTime != null "> and cancelTime = #{cancelTime}</if>
+            <if test="finishTime != null "> and finishTime = #{finishTime}</if>
+            <if test="recProv != null  and recProv != ''"> and recProv = #{recProv}</if>
+            <if test="recCity != null  and recCity != ''"> and recCity = #{recCity}</if>
+            <if test="recDistrict != null  and recDistrict != ''"> and recDistrict = #{recDistrict}</if>
+            <if test="recAddress != null  and recAddress != ''"> and recAddress = #{recAddress}</if>
+            <if test="recName != null  and recName != ''"> and recName like concat('%', #{recName}, '%')</if>
+            <if test="recMobile != null  and recMobile != ''"> and recMobile = #{recMobile}</if>
+            <if test="delFlag != null  and delFlag != ''"> and delFlag = #{delFlag}</if>
+            <if test="createUser != null  and createUser != ''"> and createUser = #{createUser}</if>
+            <if test="createTime != null "> and createTime = #{createTime}</if>
+            <if test="updateUser != null  and updateUser != ''"> and updateUser = #{updateUser}</if>
+            <if test="updateTime != null "> and updateTime = #{updateTime}</if>
+        </where>
+    </select>
+    
+    <select id="selectOrderByOrderId" parameterType="Long" resultMap="OrderResult">
+        <include refid="selectOrder"/>
+        where orderId = #{orderId}
+    </select>
+        
+    <insert id="insertOrder" parameterType="Order" useGeneratedKeys="true" keyProperty="orderId">
+        insert into t_order
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="orderNo != null">orderNo,</if>
+            <if test="orderTime != null">orderTime,</if>
+            <if test="payTime != null">payTime,</if>
+            <if test="orderStatus != null">orderStatus,</if>
+            <if test="orderAmount != null">orderAmount,</if>
+            <if test="payAmount != null">payAmount,</if>
+            <if test="buyerId != null">buyerId,</if>
+            <if test="sellerId != null">sellerId,</if>
+            <if test="cancelTime != null">cancelTime,</if>
+            <if test="finishTime != null">finishTime,</if>
+            <if test="recProv != null">recProv,</if>
+            <if test="recCity != null">recCity,</if>
+            <if test="recDistrict != null">recDistrict,</if>
+            <if test="recAddress != null">recAddress,</if>
+            <if test="recName != null">recName,</if>
+            <if test="recMobile != null">recMobile,</if>
+            <if test="remark != null">remark,</if>
+            <if test="delFlag != null">delFlag,</if>
+            <if test="createUser != null">createUser,</if>
+            <if test="createTime != null">createTime,</if>
+            <if test="updateUser != null">updateUser,</if>
+            <if test="updateTime != null">updateTime,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="orderNo != null">#{orderNo},</if>
+            <if test="orderTime != null">#{orderTime},</if>
+            <if test="payTime != null">#{payTime},</if>
+            <if test="orderStatus != null">#{orderStatus},</if>
+            <if test="orderAmount != null">#{orderAmount},</if>
+            <if test="payAmount != null">#{payAmount},</if>
+            <if test="buyerId != null">#{buyerId},</if>
+            <if test="sellerId != null">#{sellerId},</if>
+            <if test="cancelTime != null">#{cancelTime},</if>
+            <if test="finishTime != null">#{finishTime},</if>
+            <if test="recProv != null">#{recProv},</if>
+            <if test="recCity != null">#{recCity},</if>
+            <if test="recDistrict != null">#{recDistrict},</if>
+            <if test="recAddress != null">#{recAddress},</if>
+            <if test="recName != null">#{recName},</if>
+            <if test="recMobile != null">#{recMobile},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createUser != null">#{createUser},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateUser != null">#{updateUser},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+         </trim>
+    </insert>
+
+    <insert id="batchInsertOrder">
+        insert into t_order( orderNo, orderTime, payTime, orderStatus, orderAmount, payAmount, buyerId, sellerId, cancelTime, finishTime, recProv, recCity, recDistrict, recAddress, recName, recMobile, remark, delFlag, createUser, createTime, updateUser, updateTime) values
+        <foreach item="item" index="index" collection="list" separator=",">
+            ( #{item.orderNo}, #{item.orderTime}, #{item.payTime}, #{item.orderStatus}, #{item.orderAmount}, #{item.payAmount}, #{item.buyerId}, #{item.sellerId}, #{item.cancelTime}, #{item.finishTime}, #{item.recProv}, #{item.recCity}, #{item.recDistrict}, #{item.recAddress}, #{item.recName}, #{item.recMobile}, #{item.remark}, #{item.delFlag}, #{item.createUser}, #{item.createTime}, #{item.updateUser}, #{item.updateTime})
+        </foreach>
+    </insert>
+
+    <update id="updateOrder" parameterType="Order">
+        update t_order
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="orderNo != null">orderNo = #{orderNo},</if>
+            <if test="orderTime != null">orderTime = #{orderTime},</if>
+            <if test="payTime != null">payTime = #{payTime},</if>
+            <if test="orderStatus != null">orderStatus = #{orderStatus},</if>
+            <if test="orderAmount != null">orderAmount = #{orderAmount},</if>
+            <if test="payAmount != null">payAmount = #{payAmount},</if>
+            <if test="buyerId != null">buyerId = #{buyerId},</if>
+            <if test="sellerId != null">sellerId = #{sellerId},</if>
+            <if test="cancelTime != null">cancelTime = #{cancelTime},</if>
+            <if test="finishTime != null">finishTime = #{finishTime},</if>
+            <if test="recProv != null">recProv = #{recProv},</if>
+            <if test="recCity != null">recCity = #{recCity},</if>
+            <if test="recDistrict != null">recDistrict = #{recDistrict},</if>
+            <if test="recAddress != null">recAddress = #{recAddress},</if>
+            <if test="recName != null">recName = #{recName},</if>
+            <if test="recMobile != null">recMobile = #{recMobile},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="delFlag != null">delFlag = #{delFlag},</if>
+            <if test="createUser != null">createUser = #{createUser},</if>
+            <if test="createTime != null">createTime = #{createTime},</if>
+            <if test="updateUser != null">updateUser = #{updateUser},</if>
+            <if test="updateTime != null">updateTime = #{updateTime},</if>
+        </trim>
+        where orderId = #{orderId}
+    </update>
+
+    <delete id="deleteOrderByOrderId" parameterType="Long">
+        delete from t_order where orderId = #{orderId}
+    </delete>
+
+    <delete id="deleteOrderByOrderIds" parameterType="String">
+        delete from t_order where orderId in 
+        <foreach item="orderId" collection="array" open="(" separator="," close=")">
+            #{orderId}
+        </foreach>
+    </delete>
+
+    <update id="logicDeleteOrderByOrderId" parameterType="Long">
+        update t_order
+            set delFlag = '1'
+        where orderId = #{orderId}
+    </update>
+
+    <update id="logicDeleteOrderByOrderIds" parameterType="String">
+        update t_order
+        set delFlag = '1'
+        where orderId in
+        <foreach item="orderId" collection="array" open="(" separator="," close=")">
+            #{orderId}
+        </foreach>
+    </update>
+
+    <update id="logicDeleteOrderByCondition" parameterType="Order">
+        update t_order
+        set delFlag = '1'
+        <where>
+            <if test="orderNo != null  and orderNo != ''"> and orderNo = #{orderNo}</if>
+            <if test="orderTime != null "> and orderTime = #{orderTime}</if>
+            <if test="payTime != null  and payTime != ''"> and payTime = #{payTime}</if>
+            <if test="orderStatus != null  and orderStatus != ''"> and orderStatus = #{orderStatus}</if>
+            <if test="orderAmount != null "> and orderAmount = #{orderAmount}</if>
+            <if test="payAmount != null "> and payAmount = #{payAmount}</if>
+            <if test="buyerId != null "> and buyerId = #{buyerId}</if>
+            <if test="sellerId != null "> and sellerId = #{sellerId}</if>
+            <if test="cancelTime != null "> and cancelTime = #{cancelTime}</if>
+            <if test="finishTime != null "> and finishTime = #{finishTime}</if>
+            <if test="recProv != null  and recProv != ''"> and recProv = #{recProv}</if>
+            <if test="recCity != null  and recCity != ''"> and recCity = #{recCity}</if>
+            <if test="recDistrict != null  and recDistrict != ''"> and recDistrict = #{recDistrict}</if>
+            <if test="recAddress != null  and recAddress != ''"> and recAddress = #{recAddress}</if>
+            <if test="recName != null  and recName != ''"> and recName like concat('%', #{recName}, '%')</if>
+            <if test="recMobile != null  and recMobile != ''"> and recMobile = #{recMobile}</if>
+            <if test="delFlag != null  and delFlag != ''"> and delFlag = #{delFlag}</if>
+            <if test="createUser != null  and createUser != ''"> and createUser = #{createUser}</if>
+            <if test="createTime != null "> and createTime = #{createTime}</if>
+            <if test="updateUser != null  and updateUser != ''"> and updateUser = #{updateUser}</if>
+            <if test="updateTime != null "> and updateTime = #{updateTime}</if>
+        </where>
+    </update>
+</mapper>

08.src/Xingxi/xingxi-system/src/main/resources/mapper/business/PaymentInfoMapper.xml

@@ -0,0 +1,251 @@
+<?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.xingxi.business.PaymentInfo.mapper.PaymentInfoMapper">
+    <resultMap type="PaymentInfo" id="PaymentInfoResult">
+        <result property="payId"    column="payId"    />
+        <result property="delFlag"    column="delFlag"    />
+        <result property="createUser"    column="createUser"    />
+        <result property="createTime"    column="createTime"    />
+        <result property="updateUser"    column="updateUser"    />
+        <result property="updateTime"    column="updateTime"    />
+        <result property="orderId"    column="orderId"    />
+        <result property="orderNo"    column="orderNo"    />
+        <result property="payTime"    column="payTime"    />
+        <result property="sellerId"    column="sellerId"    />
+        <result property="description"    column="description"    />
+        <result property="outTradeNo"    column="outTradeNo"    />
+        <result property="notifyUrl"    column="notifyUrl"    />
+        <result property="amountTotal"    column="amountTotal"    />
+        <result property="payerOpenid"    column="payerOpenid"    />
+        <result property="prepayId"    column="prepayId"    />
+        <result property="notifyId"    column="notifyId"    />
+        <result property="notifyTime"    column="notifyTime"    />
+        <result property="eventType"    column="eventType"    />
+        <result property="transactionId"    column="transactionId"    />
+        <result property="tradeType"    column="tradeType"    />
+        <result property="tradeState"    column="tradeState"    />
+        <result property="tradeStateDesc"    column="tradeStateDesc"    />
+        <result property="bankType"    column="bankType"    />
+        <result property="successTime"    column="successTime"    />
+    </resultMap>
+
+    <sql id="selectPaymentInfo">
+        select payId, delFlag, createUser, createTime, updateUser, updateTime, orderId, orderNo, payTime, sellerId, description, outTradeNo, notifyUrl, amountTotal, payerOpenid, prepayId, notifyId, notifyTime, eventType, transactionId, tradeType, tradeState, tradeStateDesc, bankType, successTime from t_payment_info
+    </sql>
+
+    <sql id="selectPaymentInfoExt">
+        select
+            ${tableAlias}.payId,
+            ${tableAlias}.delFlag,
+            ${tableAlias}.createUser,
+            ${tableAlias}.createTime,
+            ${tableAlias}.updateUser,
+            ${tableAlias}.updateTime,
+            ${tableAlias}.orderId,
+            ${tableAlias}.orderNo,
+            ${tableAlias}.payTime,
+            ${tableAlias}.sellerId,
+            ${tableAlias}.description,
+            ${tableAlias}.outTradeNo,
+            ${tableAlias}.notifyUrl,
+            ${tableAlias}.amountTotal,
+            ${tableAlias}.payerOpenid,
+            ${tableAlias}.prepayId,
+            ${tableAlias}.notifyId,
+            ${tableAlias}.notifyTime,
+            ${tableAlias}.eventType,
+            ${tableAlias}.transactionId,
+            ${tableAlias}.tradeType,
+            ${tableAlias}.tradeState,
+            ${tableAlias}.tradeStateDesc,
+            ${tableAlias}.bankType,
+            ${tableAlias}.successTime
+        from t_payment_info ${tableAlias}
+    </sql>
+
+    <select id="selectPaymentInfoList" parameterType="PaymentInfo" resultMap="PaymentInfoResult">
+        <include refid="selectPaymentInfo"/>
+        <where>  
+            <if test="delFlag != null  and delFlag != ''"> and delFlag = #{delFlag}</if>
+            <if test="createUser != null  and createUser != ''"> and createUser = #{createUser}</if>
+            <if test="createTime != null "> and createTime = #{createTime}</if>
+            <if test="updateUser != null  and updateUser != ''"> and updateUser = #{updateUser}</if>
+            <if test="updateTime != null "> and updateTime = #{updateTime}</if>
+            <if test="orderId != null "> and orderId = #{orderId}</if>
+            <if test="orderNo != null  and orderNo != ''"> and orderNo = #{orderNo}</if>
+            <if test="payTime != null "> and payTime = #{payTime}</if>
+            <if test="sellerId != null "> and sellerId = #{sellerId}</if>
+            <if test="description != null  and description != ''"> and description = #{description}</if>
+            <if test="outTradeNo != null  and outTradeNo != ''"> and outTradeNo = #{outTradeNo}</if>
+            <if test="notifyUrl != null  and notifyUrl != ''"> and notifyUrl = #{notifyUrl}</if>
+            <if test="amountTotal != null "> and amountTotal = #{amountTotal}</if>
+            <if test="payerOpenid != null  and payerOpenid != ''"> and payerOpenid = #{payerOpenid}</if>
+            <if test="prepayId != null  and prepayId != ''"> and prepayId = #{prepayId}</if>
+            <if test="notifyId != null  and notifyId != ''"> and notifyId = #{notifyId}</if>
+            <if test="notifyTime != null "> and notifyTime = #{notifyTime}</if>
+            <if test="eventType != null  and eventType != ''"> and eventType = #{eventType}</if>
+            <if test="transactionId != null  and transactionId != ''"> and transactionId = #{transactionId}</if>
+            <if test="tradeType != null  and tradeType != ''"> and tradeType = #{tradeType}</if>
+            <if test="tradeState != null  and tradeState != ''"> and tradeState = #{tradeState}</if>
+            <if test="tradeStateDesc != null  and tradeStateDesc != ''"> and tradeStateDesc = #{tradeStateDesc}</if>
+            <if test="bankType != null  and bankType != ''"> and bankType = #{bankType}</if>
+            <if test="successTime != null "> and successTime = #{successTime}</if>
+        </where>
+    </select>
+    
+    <select id="selectPaymentInfoByPayId" parameterType="Long" resultMap="PaymentInfoResult">
+        <include refid="selectPaymentInfo"/>
+        where payId = #{payId}
+    </select>
+        
+    <insert id="insertPaymentInfo" parameterType="PaymentInfo" useGeneratedKeys="true" keyProperty="payId">
+        insert into t_payment_info
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="delFlag != null">delFlag,</if>
+            <if test="createUser != null">createUser,</if>
+            <if test="createTime != null">createTime,</if>
+            <if test="updateUser != null">updateUser,</if>
+            <if test="updateTime != null">updateTime,</if>
+            <if test="orderId != null">orderId,</if>
+            <if test="orderNo != null">orderNo,</if>
+            <if test="payTime != null">payTime,</if>
+            <if test="sellerId != null">sellerId,</if>
+            <if test="description != null">description,</if>
+            <if test="outTradeNo != null">outTradeNo,</if>
+            <if test="notifyUrl != null">notifyUrl,</if>
+            <if test="amountTotal != null">amountTotal,</if>
+            <if test="payerOpenid != null">payerOpenid,</if>
+            <if test="prepayId != null">prepayId,</if>
+            <if test="notifyId != null">notifyId,</if>
+            <if test="notifyTime != null">notifyTime,</if>
+            <if test="eventType != null">eventType,</if>
+            <if test="transactionId != null">transactionId,</if>
+            <if test="tradeType != null">tradeType,</if>
+            <if test="tradeState != null">tradeState,</if>
+            <if test="tradeStateDesc != null">tradeStateDesc,</if>
+            <if test="bankType != null">bankType,</if>
+            <if test="successTime != null">successTime,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createUser != null">#{createUser},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateUser != null">#{updateUser},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="orderId != null">#{orderId},</if>
+            <if test="orderNo != null">#{orderNo},</if>
+            <if test="payTime != null">#{payTime},</if>
+            <if test="sellerId != null">#{sellerId},</if>
+            <if test="description != null">#{description},</if>
+            <if test="outTradeNo != null">#{outTradeNo},</if>
+            <if test="notifyUrl != null">#{notifyUrl},</if>
+            <if test="amountTotal != null">#{amountTotal},</if>
+            <if test="payerOpenid != null">#{payerOpenid},</if>
+            <if test="prepayId != null">#{prepayId},</if>
+            <if test="notifyId != null">#{notifyId},</if>
+            <if test="notifyTime != null">#{notifyTime},</if>
+            <if test="eventType != null">#{eventType},</if>
+            <if test="transactionId != null">#{transactionId},</if>
+            <if test="tradeType != null">#{tradeType},</if>
+            <if test="tradeState != null">#{tradeState},</if>
+            <if test="tradeStateDesc != null">#{tradeStateDesc},</if>
+            <if test="bankType != null">#{bankType},</if>
+            <if test="successTime != null">#{successTime},</if>
+         </trim>
+    </insert>
+
+    <insert id="batchInsertPaymentInfo">
+        insert into t_payment_info( delFlag, createUser, createTime, updateUser, updateTime, orderId, orderNo, payTime, sellerId, description, outTradeNo, notifyUrl, amountTotal, payerOpenid, prepayId, notifyId, notifyTime, eventType, transactionId, tradeType, tradeState, tradeStateDesc, bankType, successTime) values
+        <foreach item="item" index="index" collection="list" separator=",">
+            ( #{item.delFlag}, #{item.createUser}, #{item.createTime}, #{item.updateUser}, #{item.updateTime}, #{item.orderId}, #{item.orderNo}, #{item.payTime}, #{item.sellerId}, #{item.description}, #{item.outTradeNo}, #{item.notifyUrl}, #{item.amountTotal}, #{item.payerOpenid}, #{item.prepayId}, #{item.notifyId}, #{item.notifyTime}, #{item.eventType}, #{item.transactionId}, #{item.tradeType}, #{item.tradeState}, #{item.tradeStateDesc}, #{item.bankType}, #{item.successTime})
+        </foreach>
+    </insert>
+
+    <update id="updatePaymentInfo" parameterType="PaymentInfo">
+        update t_payment_info
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="delFlag != null">delFlag = #{delFlag},</if>
+            <if test="createUser != null">createUser = #{createUser},</if>
+            <if test="createTime != null">createTime = #{createTime},</if>
+            <if test="updateUser != null">updateUser = #{updateUser},</if>
+            <if test="updateTime != null">updateTime = #{updateTime},</if>
+            <if test="orderId != null">orderId = #{orderId},</if>
+            <if test="orderNo != null">orderNo = #{orderNo},</if>
+            <if test="payTime != null">payTime = #{payTime},</if>
+            <if test="sellerId != null">sellerId = #{sellerId},</if>
+            <if test="description != null">description = #{description},</if>
+            <if test="outTradeNo != null">outTradeNo = #{outTradeNo},</if>
+            <if test="notifyUrl != null">notifyUrl = #{notifyUrl},</if>
+            <if test="amountTotal != null">amountTotal = #{amountTotal},</if>
+            <if test="payerOpenid != null">payerOpenid = #{payerOpenid},</if>
+            <if test="prepayId != null">prepayId = #{prepayId},</if>
+            <if test="notifyId != null">notifyId = #{notifyId},</if>
+            <if test="notifyTime != null">notifyTime = #{notifyTime},</if>
+            <if test="eventType != null">eventType = #{eventType},</if>
+            <if test="transactionId != null">transactionId = #{transactionId},</if>
+            <if test="tradeType != null">tradeType = #{tradeType},</if>
+            <if test="tradeState != null">tradeState = #{tradeState},</if>
+            <if test="tradeStateDesc != null">tradeStateDesc = #{tradeStateDesc},</if>
+            <if test="bankType != null">bankType = #{bankType},</if>
+            <if test="successTime != null">successTime = #{successTime},</if>
+        </trim>
+        where payId = #{payId}
+    </update>
+
+    <delete id="deletePaymentInfoByPayId" parameterType="Long">
+        delete from t_payment_info where payId = #{payId}
+    </delete>
+
+    <delete id="deletePaymentInfoByPayIds" parameterType="String">
+        delete from t_payment_info where payId in 
+        <foreach item="payId" collection="array" open="(" separator="," close=")">
+            #{payId}
+        </foreach>
+    </delete>
+
+    <update id="logicDeletePaymentInfoByPayId" parameterType="Long">
+        update t_payment_info
+            set delFlag = '1'
+        where payId = #{payId}
+    </update>
+
+    <update id="logicDeletePaymentInfoByPayIds" parameterType="String">
+        update t_payment_info
+        set delFlag = '1'
+        where payId in
+        <foreach item="payId" collection="array" open="(" separator="," close=")">
+            #{payId}
+        </foreach>
+    </update>
+
+    <update id="logicDeletePaymentInfoByCondition" parameterType="PaymentInfo">
+        update t_payment_info
+        set delFlag = '1'
+        <where>
+            <if test="delFlag != null  and delFlag != ''"> and delFlag = #{delFlag}</if>
+            <if test="createUser != null  and createUser != ''"> and createUser = #{createUser}</if>
+            <if test="createTime != null "> and createTime = #{createTime}</if>
+            <if test="updateUser != null  and updateUser != ''"> and updateUser = #{updateUser}</if>
+            <if test="updateTime != null "> and updateTime = #{updateTime}</if>
+            <if test="orderId != null "> and orderId = #{orderId}</if>
+            <if test="orderNo != null  and orderNo != ''"> and orderNo = #{orderNo}</if>
+            <if test="payTime != null "> and payTime = #{payTime}</if>
+            <if test="sellerId != null "> and sellerId = #{sellerId}</if>
+            <if test="description != null  and description != ''"> and description = #{description}</if>
+            <if test="outTradeNo != null  and outTradeNo != ''"> and outTradeNo = #{outTradeNo}</if>
+            <if test="notifyUrl != null  and notifyUrl != ''"> and notifyUrl = #{notifyUrl}</if>
+            <if test="amountTotal != null "> and amountTotal = #{amountTotal}</if>
+            <if test="payerOpenid != null  and payerOpenid != ''"> and payerOpenid = #{payerOpenid}</if>
+            <if test="prepayId != null  and prepayId != ''"> and prepayId = #{prepayId}</if>
+            <if test="notifyId != null  and notifyId != ''"> and notifyId = #{notifyId}</if>
+            <if test="notifyTime != null "> and notifyTime = #{notifyTime}</if>
+            <if test="eventType != null  and eventType != ''"> and eventType = #{eventType}</if>
+            <if test="transactionId != null  and transactionId != ''"> and transactionId = #{transactionId}</if>
+            <if test="tradeType != null  and tradeType != ''"> and tradeType = #{tradeType}</if>
+            <if test="tradeState != null  and tradeState != ''"> and tradeState = #{tradeState}</if>
+            <if test="tradeStateDesc != null  and tradeStateDesc != ''"> and tradeStateDesc = #{tradeStateDesc}</if>
+            <if test="bankType != null  and bankType != ''"> and bankType = #{bankType}</if>
+            <if test="successTime != null "> and successTime = #{successTime}</if>
+        </where>
+    </update>
+</mapper>

08.src/Xingxi/xingxi-system/src/main/resources/mapper/business/PopularProdMapper.xml

@@ -0,0 +1,132 @@
+<?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.xingxi.business.PopularProd.mapper.PopularProdMapper">
+    <resultMap type="PopularProd" id="PopularProdResult">
+        <result property="id"    column="id"    />
+        <result property="prodId"    column="prodId"    />
+        <result property="sort"    column="sort"    />
+        <result property="delFlag"    column="delFlag"    />
+        <result property="createUser"    column="createUser"    />
+        <result property="createTime"    column="createTime"    />
+        <result property="updateUser"    column="updateUser"    />
+        <result property="updateTime"    column="updateTime"    />
+    </resultMap>
+
+    <sql id="selectPopularProd">
+        select id, prodId, sort, delFlag, createUser, createTime, updateUser, updateTime from t_popular_prod
+    </sql>
+
+    <sql id="selectPopularProdExt">
+        select
+            ${tableAlias}.id,
+            ${tableAlias}.prodId,
+            ${tableAlias}.sort,
+            ${tableAlias}.delFlag,
+            ${tableAlias}.createUser,
+            ${tableAlias}.createTime,
+            ${tableAlias}.updateUser,
+            ${tableAlias}.updateTime
+        from t_popular_prod ${tableAlias}
+    </sql>
+
+    <select id="selectPopularProdList" parameterType="PopularProd" resultMap="PopularProdResult">
+        <include refid="selectPopularProd"/>
+        <where>  
+            <if test="prodId != null "> and prodId = #{prodId}</if>
+            <if test="sort != null "> and sort = #{sort}</if>
+            <if test="delFlag != null  and delFlag != ''"> and delFlag = #{delFlag}</if>
+            <if test="createUser != null  and createUser != ''"> and createUser = #{createUser}</if>
+            <if test="createTime != null "> and createTime = #{createTime}</if>
+            <if test="updateUser != null  and updateUser != ''"> and updateUser = #{updateUser}</if>
+            <if test="updateTime != null "> and updateTime = #{updateTime}</if>
+        </where>
+    </select>
+    
+    <select id="selectPopularProdById" parameterType="Long" resultMap="PopularProdResult">
+        <include refid="selectPopularProd"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertPopularProd" parameterType="PopularProd" useGeneratedKeys="true" keyProperty="id">
+        insert into t_popular_prod
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="prodId != null">prodId,</if>
+            <if test="sort != null">sort,</if>
+            <if test="delFlag != null">delFlag,</if>
+            <if test="createUser != null">createUser,</if>
+            <if test="createTime != null">createTime,</if>
+            <if test="updateUser != null">updateUser,</if>
+            <if test="updateTime != null">updateTime,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="prodId != null">#{prodId},</if>
+            <if test="sort != null">#{sort},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createUser != null">#{createUser},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateUser != null">#{updateUser},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+         </trim>
+    </insert>
+
+    <insert id="batchInsertPopularProd">
+        insert into t_popular_prod( prodId, sort, delFlag, createUser, createTime, updateUser, updateTime) values
+        <foreach item="item" index="index" collection="list" separator=",">
+            ( #{item.prodId}, #{item.sort}, #{item.delFlag}, #{item.createUser}, #{item.createTime}, #{item.updateUser}, #{item.updateTime})
+        </foreach>
+    </insert>
+
+    <update id="updatePopularProd" parameterType="PopularProd">
+        update t_popular_prod
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="prodId != null">prodId = #{prodId},</if>
+            <if test="sort != null">sort = #{sort},</if>
+            <if test="delFlag != null">delFlag = #{delFlag},</if>
+            <if test="createUser != null">createUser = #{createUser},</if>
+            <if test="createTime != null">createTime = #{createTime},</if>
+            <if test="updateUser != null">updateUser = #{updateUser},</if>
+            <if test="updateTime != null">updateTime = #{updateTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deletePopularProdById" parameterType="Long">
+        delete from t_popular_prod where id = #{id}
+    </delete>
+
+    <delete id="deletePopularProdByIds" parameterType="String">
+        delete from t_popular_prod where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+    <update id="logicDeletePopularProdById" parameterType="Long">
+        update t_popular_prod
+            set delFlag = '1'
+        where id = #{id}
+    </update>
+
+    <update id="logicDeletePopularProdByIds" parameterType="String">
+        update t_popular_prod
+        set delFlag = '1'
+        where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+
+    <update id="logicDeletePopularProdByCondition" parameterType="PopularProd">
+        update t_popular_prod
+        set delFlag = '1'
+        <where>
+            <if test="prodId != null "> and prodId = #{prodId}</if>
+            <if test="sort != null "> and sort = #{sort}</if>
+            <if test="delFlag != null  and delFlag != ''"> and delFlag = #{delFlag}</if>
+            <if test="createUser != null  and createUser != ''"> and createUser = #{createUser}</if>
+            <if test="createTime != null "> and createTime = #{createTime}</if>
+            <if test="updateUser != null  and updateUser != ''"> and updateUser = #{updateUser}</if>
+            <if test="updateTime != null "> and updateTime = #{updateTime}</if>
+        </where>
+    </update>
+</mapper>

08.src/Xingxi/xingxi-system/src/main/resources/mapper/business/ProdInventoryBillMapper.xml

@@ -0,0 +1,165 @@
+<?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.xingxi.business.ProdInventory.mapper.ProdInventoryBillMapper">
+    <resultMap type="ProdInventoryBill" id="ProdInventoryBillResult">
+        <result property="inventoryBillId"    column="inventoryBillId"    />
+        <result property="billTime"    column="billTime"    />
+        <result property="billType"    column="billType"    />
+        <result property="inventoryId"    column="inventoryId"    />
+        <result property="quantity"    column="quantity"    />
+        <result property="orderId"    column="orderId"    />
+        <result property="orderNo"    column="orderNo"    />
+        <result property="remark"    column="remark"    />
+        <result property="delFlag"    column="delFlag"    />
+        <result property="createUser"    column="createUser"    />
+        <result property="createTime"    column="createTime"    />
+        <result property="updateUser"    column="updateUser"    />
+        <result property="updateTime"    column="updateTime"    />
+    </resultMap>
+
+    <sql id="selectProdInventoryBill">
+        select inventoryBillId, billTime, billType, inventoryId, quantity, orderId, orderNo, remark, delFlag, createUser, createTime, updateUser, updateTime from t_prod_inventory_bill
+    </sql>
+
+    <sql id="selectProdInventoryBillExt">
+        select
+            ${tableAlias}.inventoryBillId,
+            ${tableAlias}.billTime,
+            ${tableAlias}.billType,
+            ${tableAlias}.inventoryId,
+            ${tableAlias}.quantity,
+            ${tableAlias}.orderId,
+            ${tableAlias}.orderNo,
+            ${tableAlias}.remark,
+            ${tableAlias}.delFlag,
+            ${tableAlias}.createUser,
+            ${tableAlias}.createTime,
+            ${tableAlias}.updateUser,
+            ${tableAlias}.updateTime
+        from t_prod_inventory_bill ${tableAlias}
+    </sql>
+
+    <select id="selectProdInventoryBillList" parameterType="ProdInventoryBill" resultMap="ProdInventoryBillResult">
+        <include refid="selectProdInventoryBill"/>
+        <where>  
+            <if test="billTime != null "> and billTime = #{billTime}</if>
+            <if test="billType != null  and billType != ''"> and billType = #{billType}</if>
+            <if test="inventoryId != null "> and inventoryId = #{inventoryId}</if>
+            <if test="quantity != null "> and quantity = #{quantity}</if>
+            <if test="orderId != null "> and orderId = #{orderId}</if>
+            <if test="orderNo != null  and orderNo != ''"> and orderNo = #{orderNo}</if>
+            <if test="delFlag != null  and delFlag != ''"> and delFlag = #{delFlag}</if>
+            <if test="createUser != null  and createUser != ''"> and createUser = #{createUser}</if>
+            <if test="createTime != null "> and createTime = #{createTime}</if>
+            <if test="updateUser != null  and updateUser != ''"> and updateUser = #{updateUser}</if>
+            <if test="updateTime != null "> and updateTime = #{updateTime}</if>
+        </where>
+    </select>
+    
+    <select id="selectProdInventoryBillByInventoryBillId" parameterType="Long" resultMap="ProdInventoryBillResult">
+        <include refid="selectProdInventoryBill"/>
+        where inventoryBillId = #{inventoryBillId}
+    </select>
+        
+    <insert id="insertProdInventoryBill" parameterType="ProdInventoryBill" useGeneratedKeys="true" keyProperty="inventoryBillId">
+        insert into t_prod_inventory_bill
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="billTime != null">billTime,</if>
+            <if test="billType != null">billType,</if>
+            <if test="inventoryId != null">inventoryId,</if>
+            <if test="quantity != null">quantity,</if>
+            <if test="orderId != null">orderId,</if>
+            <if test="orderNo != null">orderNo,</if>
+            <if test="remark != null">remark,</if>
+            <if test="delFlag != null">delFlag,</if>
+            <if test="createUser != null">createUser,</if>
+            <if test="createTime != null">createTime,</if>
+            <if test="updateUser != null">updateUser,</if>
+            <if test="updateTime != null">updateTime,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="billTime != null">#{billTime},</if>
+            <if test="billType != null">#{billType},</if>
+            <if test="inventoryId != null">#{inventoryId},</if>
+            <if test="quantity != null">#{quantity},</if>
+            <if test="orderId != null">#{orderId},</if>
+            <if test="orderNo != null">#{orderNo},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createUser != null">#{createUser},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateUser != null">#{updateUser},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+         </trim>
+    </insert>
+
+    <insert id="batchInsertProdInventoryBill">
+        insert into t_prod_inventory_bill( billTime, billType, inventoryId, quantity, orderId, orderNo, remark, delFlag, createUser, createTime, updateUser, updateTime) values
+        <foreach item="item" index="index" collection="list" separator=",">
+            ( #{item.billTime}, #{item.billType}, #{item.inventoryId}, #{item.quantity}, #{item.orderId}, #{item.orderNo}, #{item.remark}, #{item.delFlag}, #{item.createUser}, #{item.createTime}, #{item.updateUser}, #{item.updateTime})
+        </foreach>
+    </insert>
+
+    <update id="updateProdInventoryBill" parameterType="ProdInventoryBill">
+        update t_prod_inventory_bill
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="billTime != null">billTime = #{billTime},</if>
+            <if test="billType != null">billType = #{billType},</if>
+            <if test="inventoryId != null">inventoryId = #{inventoryId},</if>
+            <if test="quantity != null">quantity = #{quantity},</if>
+            <if test="orderId != null">orderId = #{orderId},</if>
+            <if test="orderNo != null">orderNo = #{orderNo},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="delFlag != null">delFlag = #{delFlag},</if>
+            <if test="createUser != null">createUser = #{createUser},</if>
+            <if test="createTime != null">createTime = #{createTime},</if>
+            <if test="updateUser != null">updateUser = #{updateUser},</if>
+            <if test="updateTime != null">updateTime = #{updateTime},</if>
+        </trim>
+        where inventoryBillId = #{inventoryBillId}
+    </update>
+
+    <delete id="deleteProdInventoryBillByInventoryBillId" parameterType="Long">
+        delete from t_prod_inventory_bill where inventoryBillId = #{inventoryBillId}
+    </delete>
+
+    <delete id="deleteProdInventoryBillByInventoryBillIds" parameterType="String">
+        delete from t_prod_inventory_bill where inventoryBillId in 
+        <foreach item="inventoryBillId" collection="array" open="(" separator="," close=")">
+            #{inventoryBillId}
+        </foreach>
+    </delete>
+
+    <update id="logicDeleteProdInventoryBillByInventoryBillId" parameterType="Long">
+        update t_prod_inventory_bill
+            set delFlag = '1'
+        where inventoryBillId = #{inventoryBillId}
+    </update>
+
+    <update id="logicDeleteProdInventoryBillByInventoryBillIds" parameterType="String">
+        update t_prod_inventory_bill
+        set delFlag = '1'
+        where inventoryBillId in
+        <foreach item="inventoryBillId" collection="array" open="(" separator="," close=")">
+            #{inventoryBillId}
+        </foreach>
+    </update>
+
+    <update id="logicDeleteProdInventoryBillByCondition" parameterType="ProdInventoryBill">
+        update t_prod_inventory_bill
+        set delFlag = '1'
+        <where>
+            <if test="billTime != null "> and billTime = #{billTime}</if>
+            <if test="billType != null  and billType != ''"> and billType = #{billType}</if>
+            <if test="inventoryId != null "> and inventoryId = #{inventoryId}</if>
+            <if test="quantity != null "> and quantity = #{quantity}</if>
+            <if test="orderId != null "> and orderId = #{orderId}</if>
+            <if test="orderNo != null  and orderNo != ''"> and orderNo = #{orderNo}</if>
+            <if test="delFlag != null  and delFlag != ''"> and delFlag = #{delFlag}</if>
+            <if test="createUser != null  and createUser != ''"> and createUser = #{createUser}</if>
+            <if test="createTime != null "> and createTime = #{createTime}</if>
+            <if test="updateUser != null  and updateUser != ''"> and updateUser = #{updateUser}</if>
+            <if test="updateTime != null "> and updateTime = #{updateTime}</if>
+        </where>
+    </update>
+</mapper>

08.src/Xingxi/xingxi-system/src/main/resources/mapper/business/ProdInventoryMapper.xml

@@ -0,0 +1,153 @@
+<?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.xingxi.business.ProdInventory.mapper.ProdInventoryMapper">
+    <resultMap type="ProdInventory" id="ProdInventoryResult">
+        <result property="prodInventoryId"    column="prodInventoryId"    />
+        <result property="prodId"    column="prodId"    />
+        <result property="prodAttrId"    column="prodAttrId"    />
+        <result property="mercId"    column="mercId"    />
+        <result property="quantity"    column="quantity"    />
+        <result property="availQty"    column="availQty"    />
+        <result property="delFlag"    column="delFlag"    />
+        <result property="createUser"    column="createUser"    />
+        <result property="createTime"    column="createTime"    />
+        <result property="updateUser"    column="updateUser"    />
+        <result property="updateTime"    column="updateTime"    />
+    </resultMap>
+
+    <sql id="selectProdInventory">
+        select prodInventoryId, prodId, prodAttrId, mercId, quantity, availQty, delFlag, createUser, createTime, updateUser, updateTime from t_prod_inventory
+    </sql>
+
+    <sql id="selectProdInventoryExt">
+        select
+            ${tableAlias}.prodInventoryId,
+            ${tableAlias}.prodId,
+            ${tableAlias}.prodAttrId,
+            ${tableAlias}.mercId,
+            ${tableAlias}.quantity,
+            ${tableAlias}.availQty,
+            ${tableAlias}.delFlag,
+            ${tableAlias}.createUser,
+            ${tableAlias}.createTime,
+            ${tableAlias}.updateUser,
+            ${tableAlias}.updateTime
+        from t_prod_inventory ${tableAlias}
+    </sql>
+
+    <select id="selectProdInventoryList" parameterType="ProdInventory" resultMap="ProdInventoryResult">
+        <include refid="selectProdInventory"/>
+        <where>  
+            <if test="prodId != null "> and prodId = #{prodId}</if>
+            <if test="prodAttrId != null "> and prodAttrId = #{prodAttrId}</if>
+            <if test="mercId != null "> and mercId = #{mercId}</if>
+            <if test="quantity != null "> and quantity = #{quantity}</if>
+            <if test="availQty != null "> and availQty = #{availQty}</if>
+            <if test="delFlag != null  and delFlag != ''"> and delFlag = #{delFlag}</if>
+            <if test="createUser != null  and createUser != ''"> and createUser = #{createUser}</if>
+            <if test="createTime != null "> and createTime = #{createTime}</if>
+            <if test="updateUser != null  and updateUser != ''"> and updateUser = #{updateUser}</if>
+            <if test="updateTime != null "> and updateTime = #{updateTime}</if>
+        </where>
+    </select>
+    
+    <select id="selectProdInventoryByProdInventoryId" parameterType="Long" resultMap="ProdInventoryResult">
+        <include refid="selectProdInventory"/>
+        where prodInventoryId = #{prodInventoryId}
+    </select>
+        
+    <insert id="insertProdInventory" parameterType="ProdInventory" useGeneratedKeys="true" keyProperty="prodInventoryId">
+        insert into t_prod_inventory
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="prodId != null">prodId,</if>
+            <if test="prodAttrId != null">prodAttrId,</if>
+            <if test="mercId != null">mercId,</if>
+            <if test="quantity != null">quantity,</if>
+            <if test="availQty != null">availQty,</if>
+            <if test="delFlag != null">delFlag,</if>
+            <if test="createUser != null">createUser,</if>
+            <if test="createTime != null">createTime,</if>
+            <if test="updateUser != null">updateUser,</if>
+            <if test="updateTime != null">updateTime,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="prodId != null">#{prodId},</if>
+            <if test="prodAttrId != null">#{prodAttrId},</if>
+            <if test="mercId != null">#{mercId},</if>
+            <if test="quantity != null">#{quantity},</if>
+            <if test="availQty != null">#{availQty},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createUser != null">#{createUser},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateUser != null">#{updateUser},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+         </trim>
+    </insert>
+
+    <insert id="batchInsertProdInventory">
+        insert into t_prod_inventory( prodId, prodAttrId, mercId, quantity, availQty, delFlag, createUser, createTime, updateUser, updateTime) values
+        <foreach item="item" index="index" collection="list" separator=",">
+            ( #{item.prodId}, #{item.prodAttrId}, #{item.mercId}, #{item.quantity}, #{item.availQty}, #{item.delFlag}, #{item.createUser}, #{item.createTime}, #{item.updateUser}, #{item.updateTime})
+        </foreach>
+    </insert>
+
+    <update id="updateProdInventory" parameterType="ProdInventory">
+        update t_prod_inventory
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="prodId != null">prodId = #{prodId},</if>
+            <if test="prodAttrId != null">prodAttrId = #{prodAttrId},</if>
+            <if test="mercId != null">mercId = #{mercId},</if>
+            <if test="quantity != null">quantity = #{quantity},</if>
+            <if test="availQty != null">availQty = #{availQty},</if>
+            <if test="delFlag != null">delFlag = #{delFlag},</if>
+            <if test="createUser != null">createUser = #{createUser},</if>
+            <if test="createTime != null">createTime = #{createTime},</if>
+            <if test="updateUser != null">updateUser = #{updateUser},</if>
+            <if test="updateTime != null">updateTime = #{updateTime},</if>
+        </trim>
+        where prodInventoryId = #{prodInventoryId}
+    </update>
+
+    <delete id="deleteProdInventoryByProdInventoryId" parameterType="Long">
+        delete from t_prod_inventory where prodInventoryId = #{prodInventoryId}
+    </delete>
+
+    <delete id="deleteProdInventoryByProdInventoryIds" parameterType="String">
+        delete from t_prod_inventory where prodInventoryId in 
+        <foreach item="prodInventoryId" collection="array" open="(" separator="," close=")">
+            #{prodInventoryId}
+        </foreach>
+    </delete>
+
+    <update id="logicDeleteProdInventoryByProdInventoryId" parameterType="Long">
+        update t_prod_inventory
+            set delFlag = '1'
+        where prodInventoryId = #{prodInventoryId}
+    </update>
+
+    <update id="logicDeleteProdInventoryByProdInventoryIds" parameterType="String">
+        update t_prod_inventory
+        set delFlag = '1'
+        where prodInventoryId in
+        <foreach item="prodInventoryId" collection="array" open="(" separator="," close=")">
+            #{prodInventoryId}
+        </foreach>
+    </update>
+
+    <update id="logicDeleteProdInventoryByCondition" parameterType="ProdInventory">
+        update t_prod_inventory
+        set delFlag = '1'
+        <where>
+            <if test="prodId != null "> and prodId = #{prodId}</if>
+            <if test="prodAttrId != null "> and prodAttrId = #{prodAttrId}</if>
+            <if test="mercId != null "> and mercId = #{mercId}</if>
+            <if test="quantity != null "> and quantity = #{quantity}</if>
+            <if test="availQty != null "> and availQty = #{availQty}</if>
+            <if test="delFlag != null  and delFlag != ''"> and delFlag = #{delFlag}</if>
+            <if test="createUser != null  and createUser != ''"> and createUser = #{createUser}</if>
+            <if test="createTime != null "> and createTime = #{createTime}</if>
+            <if test="updateUser != null  and updateUser != ''"> and updateUser = #{updateUser}</if>
+            <if test="updateTime != null "> and updateTime = #{updateTime}</if>
+        </where>
+    </update>
+</mapper>

08.src/Xingxi/xingxi-system/src/main/resources/mapper/business/ProdInventoryOrderDetailMapper.xml

@@ -0,0 +1,160 @@
+<?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.xingxi.business.ProdInventory.mapper.ProdInventoryOrderDetailMapper">
+    <resultMap type="ProdInventoryOrderDetail" id="ProdInventoryOrderDetailResult">
+        <result property="inventoryOrderDetailId"    column="inventoryOrderDetailId"    />
+        <result property="inventoryOrderId"    column="inventoryOrderId"    />
+        <result property="prodId"    column="prodId"    />
+        <result property="prodName"    column="prodName"    />
+        <result property="prodAttrId"    column="prodAttrId"    />
+        <result property="prodAttrName"    column="prodAttrName"    />
+        <result property="quantity"    column="quantity"    />
+        <result property="delFlag"    column="delFlag"    />
+        <result property="createUser"    column="createUser"    />
+        <result property="createTime"    column="createTime"    />
+        <result property="updateUser"    column="updateUser"    />
+        <result property="updateTime"    column="updateTime"    />
+    </resultMap>
+
+    <sql id="selectProdInventoryOrderDetail">
+        select inventoryOrderDetailId, inventoryOrderId, prodId, prodName, prodAttrId, prodAttrName, quantity, delFlag, createUser, createTime, updateUser, updateTime from t_prod_inventory_order_detail
+    </sql>
+
+    <sql id="selectProdInventoryOrderDetailExt">
+        select
+            ${tableAlias}.inventoryOrderDetailId,
+            ${tableAlias}.inventoryOrderId,
+            ${tableAlias}.prodId,
+            ${tableAlias}.prodName,
+            ${tableAlias}.prodAttrId,
+            ${tableAlias}.prodAttrName,
+            ${tableAlias}.quantity,
+            ${tableAlias}.delFlag,
+            ${tableAlias}.createUser,
+            ${tableAlias}.createTime,
+            ${tableAlias}.updateUser,
+            ${tableAlias}.updateTime
+        from t_prod_inventory_order_detail ${tableAlias}
+    </sql>
+
+    <select id="selectProdInventoryOrderDetailList" parameterType="ProdInventoryOrderDetail" resultMap="ProdInventoryOrderDetailResult">
+        <include refid="selectProdInventoryOrderDetail"/>
+        <where>  
+            <if test="inventoryOrderId != null "> and inventoryOrderId = #{inventoryOrderId}</if>
+            <if test="prodId != null "> and prodId = #{prodId}</if>
+            <if test="prodName != null  and prodName != ''"> and prodName like concat('%', #{prodName}, '%')</if>
+            <if test="prodAttrId != null "> and prodAttrId = #{prodAttrId}</if>
+            <if test="prodAttrName != null  and prodAttrName != ''"> and prodAttrName like concat('%', #{prodAttrName}, '%')</if>
+            <if test="quantity != null "> and quantity = #{quantity}</if>
+            <if test="delFlag != null  and delFlag != ''"> and delFlag = #{delFlag}</if>
+            <if test="createUser != null  and createUser != ''"> and createUser = #{createUser}</if>
+            <if test="createTime != null "> and createTime = #{createTime}</if>
+            <if test="updateUser != null  and updateUser != ''"> and updateUser = #{updateUser}</if>
+            <if test="updateTime != null "> and updateTime = #{updateTime}</if>
+        </where>
+    </select>
+    
+    <select id="selectProdInventoryOrderDetailByInventoryOrderDetailId" parameterType="Long" resultMap="ProdInventoryOrderDetailResult">
+        <include refid="selectProdInventoryOrderDetail"/>
+        where inventoryOrderDetailId = #{inventoryOrderDetailId}
+    </select>
+        
+    <insert id="insertProdInventoryOrderDetail" parameterType="ProdInventoryOrderDetail" useGeneratedKeys="true" keyProperty="inventoryOrderDetailId">
+        insert into t_prod_inventory_order_detail
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="inventoryOrderId != null">inventoryOrderId,</if>
+            <if test="prodId != null">prodId,</if>
+            <if test="prodName != null">prodName,</if>
+            <if test="prodAttrId != null">prodAttrId,</if>
+            <if test="prodAttrName != null">prodAttrName,</if>
+            <if test="quantity != null">quantity,</if>
+            <if test="delFlag != null">delFlag,</if>
+            <if test="createUser != null">createUser,</if>
+            <if test="createTime != null">createTime,</if>
+            <if test="updateUser != null">updateUser,</if>
+            <if test="updateTime != null">updateTime,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="inventoryOrderId != null">#{inventoryOrderId},</if>
+            <if test="prodId != null">#{prodId},</if>
+            <if test="prodName != null">#{prodName},</if>
+            <if test="prodAttrId != null">#{prodAttrId},</if>
+            <if test="prodAttrName != null">#{prodAttrName},</if>
+            <if test="quantity != null">#{quantity},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createUser != null">#{createUser},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateUser != null">#{updateUser},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+         </trim>
+    </insert>
+
+    <insert id="batchInsertProdInventoryOrderDetail">
+        insert into t_prod_inventory_order_detail( inventoryOrderId, prodId, prodName, prodAttrId, prodAttrName, quantity, delFlag, createUser, createTime, updateUser, updateTime) values
+        <foreach item="item" index="index" collection="list" separator=",">
+            ( #{item.inventoryOrderId}, #{item.prodId}, #{item.prodName}, #{item.prodAttrId}, #{item.prodAttrName}, #{item.quantity}, #{item.delFlag}, #{item.createUser}, #{item.createTime}, #{item.updateUser}, #{item.updateTime})
+        </foreach>
+    </insert>
+
+    <update id="updateProdInventoryOrderDetail" parameterType="ProdInventoryOrderDetail">
+        update t_prod_inventory_order_detail
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="inventoryOrderId != null">inventoryOrderId = #{inventoryOrderId},</if>
+            <if test="prodId != null">prodId = #{prodId},</if>
+            <if test="prodName != null">prodName = #{prodName},</if>
+            <if test="prodAttrId != null">prodAttrId = #{prodAttrId},</if>
+            <if test="prodAttrName != null">prodAttrName = #{prodAttrName},</if>
+            <if test="quantity != null">quantity = #{quantity},</if>
+            <if test="delFlag != null">delFlag = #{delFlag},</if>
+            <if test="createUser != null">createUser = #{createUser},</if>
+            <if test="createTime != null">createTime = #{createTime},</if>
+            <if test="updateUser != null">updateUser = #{updateUser},</if>
+            <if test="updateTime != null">updateTime = #{updateTime},</if>
+        </trim>
+        where inventoryOrderDetailId = #{inventoryOrderDetailId}
+    </update>
+
+    <delete id="deleteProdInventoryOrderDetailByInventoryOrderDetailId" parameterType="Long">
+        delete from t_prod_inventory_order_detail where inventoryOrderDetailId = #{inventoryOrderDetailId}
+    </delete>
+
+    <delete id="deleteProdInventoryOrderDetailByInventoryOrderDetailIds" parameterType="String">
+        delete from t_prod_inventory_order_detail where inventoryOrderDetailId in 
+        <foreach item="inventoryOrderDetailId" collection="array" open="(" separator="," close=")">
+            #{inventoryOrderDetailId}
+        </foreach>
+    </delete>
+
+    <update id="logicDeleteProdInventoryOrderDetailByInventoryOrderDetailId" parameterType="Long">
+        update t_prod_inventory_order_detail
+            set delFlag = '1'
+        where inventoryOrderDetailId = #{inventoryOrderDetailId}
+    </update>
+
+    <update id="logicDeleteProdInventoryOrderDetailByInventoryOrderDetailIds" parameterType="String">
+        update t_prod_inventory_order_detail
+        set delFlag = '1'
+        where inventoryOrderDetailId in
+        <foreach item="inventoryOrderDetailId" collection="array" open="(" separator="," close=")">
+            #{inventoryOrderDetailId}
+        </foreach>
+    </update>
+
+    <update id="logicDeleteProdInventoryOrderDetailByCondition" parameterType="ProdInventoryOrderDetail">
+        update t_prod_inventory_order_detail
+        set delFlag = '1'
+        <where>
+            <if test="inventoryOrderId != null "> and inventoryOrderId = #{inventoryOrderId}</if>
+            <if test="prodId != null "> and prodId = #{prodId}</if>
+            <if test="prodName != null  and prodName != ''"> and prodName like concat('%', #{prodName}, '%')</if>
+            <if test="prodAttrId != null "> and prodAttrId = #{prodAttrId}</if>
+            <if test="prodAttrName != null  and prodAttrName != ''"> and prodAttrName like concat('%', #{prodAttrName}, '%')</if>
+            <if test="quantity != null "> and quantity = #{quantity}</if>
+            <if test="delFlag != null  and delFlag != ''"> and delFlag = #{delFlag}</if>
+            <if test="createUser != null  and createUser != ''"> and createUser = #{createUser}</if>
+            <if test="createTime != null "> and createTime = #{createTime}</if>
+            <if test="updateUser != null  and updateUser != ''"> and updateUser = #{updateUser}</if>
+            <if test="updateTime != null "> and updateTime = #{updateTime}</if>
+        </where>
+    </update>
+</mapper>

08.src/Xingxi/xingxi-system/src/main/resources/mapper/business/ProdInventoryOrderMapper.xml

@@ -0,0 +1,151 @@
+<?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.xingxi.business.ProdInventory.mapper.ProdInventoryOrderMapper">
+    <resultMap type="ProdInventoryOrder" id="ProdInventoryOrderResult">
+        <result property="inventoryOrderId"    column="inventoryOrderId"    />
+        <result property="ioFlag"    column="ioFlag"    />
+        <result property="iotype"    column="iotype"    />
+        <result property="inId"    column="inId"    />
+        <result property="outId"    column="outId"    />
+        <result property="remark"    column="remark"    />
+        <result property="delFlag"    column="delFlag"    />
+        <result property="createUser"    column="createUser"    />
+        <result property="createTime"    column="createTime"    />
+        <result property="updateUser"    column="updateUser"    />
+        <result property="updateTime"    column="updateTime"    />
+    </resultMap>
+
+    <sql id="selectProdInventoryOrder">
+        select inventoryOrderId, ioFlag, iotype, inId, outId, remark, delFlag, createUser, createTime, updateUser, updateTime from t_prod_inventory_order
+    </sql>
+
+    <sql id="selectProdInventoryOrderExt">
+        select
+            ${tableAlias}.inventoryOrderId,
+            ${tableAlias}.ioFlag,
+            ${tableAlias}.iotype,
+            ${tableAlias}.inId,
+            ${tableAlias}.outId,
+            ${tableAlias}.remark,
+            ${tableAlias}.delFlag,
+            ${tableAlias}.createUser,
+            ${tableAlias}.createTime,
+            ${tableAlias}.updateUser,
+            ${tableAlias}.updateTime
+        from t_prod_inventory_order ${tableAlias}
+    </sql>
+
+    <select id="selectProdInventoryOrderList" parameterType="ProdInventoryOrder" resultMap="ProdInventoryOrderResult">
+        <include refid="selectProdInventoryOrder"/>
+        <where>  
+            <if test="ioFlag != null  and ioFlag != ''"> and ioFlag = #{ioFlag}</if>
+            <if test="iotype != null  and iotype != ''"> and iotype = #{iotype}</if>
+            <if test="inId != null "> and inId = #{inId}</if>
+            <if test="outId != null "> and outId = #{outId}</if>
+            <if test="delFlag != null  and delFlag != ''"> and delFlag = #{delFlag}</if>
+            <if test="createUser != null  and createUser != ''"> and createUser = #{createUser}</if>
+            <if test="createTime != null "> and createTime = #{createTime}</if>
+            <if test="updateUser != null  and updateUser != ''"> and updateUser = #{updateUser}</if>
+            <if test="updateTime != null "> and updateTime = #{updateTime}</if>
+        </where>
+    </select>
+    
+    <select id="selectProdInventoryOrderByInventoryOrderId" parameterType="Long" resultMap="ProdInventoryOrderResult">
+        <include refid="selectProdInventoryOrder"/>
+        where inventoryOrderId = #{inventoryOrderId}
+    </select>
+        
+    <insert id="insertProdInventoryOrder" parameterType="ProdInventoryOrder" useGeneratedKeys="true" keyProperty="inventoryOrderId">
+        insert into t_prod_inventory_order
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="ioFlag != null">ioFlag,</if>
+            <if test="iotype != null">iotype,</if>
+            <if test="inId != null">inId,</if>
+            <if test="outId != null">outId,</if>
+            <if test="remark != null">remark,</if>
+            <if test="delFlag != null">delFlag,</if>
+            <if test="createUser != null">createUser,</if>
+            <if test="createTime != null">createTime,</if>
+            <if test="updateUser != null">updateUser,</if>
+            <if test="updateTime != null">updateTime,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="ioFlag != null">#{ioFlag},</if>
+            <if test="iotype != null">#{iotype},</if>
+            <if test="inId != null">#{inId},</if>
+            <if test="outId != null">#{outId},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createUser != null">#{createUser},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateUser != null">#{updateUser},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+         </trim>
+    </insert>
+
+    <insert id="batchInsertProdInventoryOrder">
+        insert into t_prod_inventory_order( ioFlag, iotype, inId, outId, remark, delFlag, createUser, createTime, updateUser, updateTime) values
+        <foreach item="item" index="index" collection="list" separator=",">
+            ( #{item.ioFlag}, #{item.iotype}, #{item.inId}, #{item.outId}, #{item.remark}, #{item.delFlag}, #{item.createUser}, #{item.createTime}, #{item.updateUser}, #{item.updateTime})
+        </foreach>
+    </insert>
+
+    <update id="updateProdInventoryOrder" parameterType="ProdInventoryOrder">
+        update t_prod_inventory_order
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="ioFlag != null">ioFlag = #{ioFlag},</if>
+            <if test="iotype != null">iotype = #{iotype},</if>
+            <if test="inId != null">inId = #{inId},</if>
+            <if test="outId != null">outId = #{outId},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="delFlag != null">delFlag = #{delFlag},</if>
+            <if test="createUser != null">createUser = #{createUser},</if>
+            <if test="createTime != null">createTime = #{createTime},</if>
+            <if test="updateUser != null">updateUser = #{updateUser},</if>
+            <if test="updateTime != null">updateTime = #{updateTime},</if>
+        </trim>
+        where inventoryOrderId = #{inventoryOrderId}
+    </update>
+
+    <delete id="deleteProdInventoryOrderByInventoryOrderId" parameterType="Long">
+        delete from t_prod_inventory_order where inventoryOrderId = #{inventoryOrderId}
+    </delete>
+
+    <delete id="deleteProdInventoryOrderByInventoryOrderIds" parameterType="String">
+        delete from t_prod_inventory_order where inventoryOrderId in 
+        <foreach item="inventoryOrderId" collection="array" open="(" separator="," close=")">
+            #{inventoryOrderId}
+        </foreach>
+    </delete>
+
+    <update id="logicDeleteProdInventoryOrderByInventoryOrderId" parameterType="Long">
+        update t_prod_inventory_order
+            set delFlag = '1'
+        where inventoryOrderId = #{inventoryOrderId}
+    </update>
+
+    <update id="logicDeleteProdInventoryOrderByInventoryOrderIds" parameterType="String">
+        update t_prod_inventory_order
+        set delFlag = '1'
+        where inventoryOrderId in
+        <foreach item="inventoryOrderId" collection="array" open="(" separator="," close=")">
+            #{inventoryOrderId}
+        </foreach>
+    </update>
+
+    <update id="logicDeleteProdInventoryOrderByCondition" parameterType="ProdInventoryOrder">
+        update t_prod_inventory_order
+        set delFlag = '1'
+        <where>
+            <if test="ioFlag != null  and ioFlag != ''"> and ioFlag = #{ioFlag}</if>
+            <if test="iotype != null  and iotype != ''"> and iotype = #{iotype}</if>
+            <if test="inId != null "> and inId = #{inId}</if>
+            <if test="outId != null "> and outId = #{outId}</if>
+            <if test="delFlag != null  and delFlag != ''"> and delFlag = #{delFlag}</if>
+            <if test="createUser != null  and createUser != ''"> and createUser = #{createUser}</if>
+            <if test="createTime != null "> and createTime = #{createTime}</if>
+            <if test="updateUser != null  and updateUser != ''"> and updateUser = #{updateUser}</if>
+            <if test="updateTime != null "> and updateTime = #{updateTime}</if>
+        </where>
+    </update>
+</mapper>

08.src/Xingxi/xingxi-system/src/main/resources/mapper/business/SuggestProdMapper.xml

@@ -0,0 +1,132 @@
+<?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.xingxi.business.SuggestProd.mapper.SuggestProdMapper">
+    <resultMap type="SuggestProd" id="SuggestProdResult">
+        <result property="id"    column="id"    />
+        <result property="prodId"    column="prodId"    />
+        <result property="sort"    column="sort"    />
+        <result property="delFlag"    column="delFlag"    />
+        <result property="createUser"    column="createUser"    />
+        <result property="createTime"    column="createTime"    />
+        <result property="updateUser"    column="updateUser"    />
+        <result property="updateTime"    column="updateTime"    />
+    </resultMap>
+
+    <sql id="selectSuggestProd">
+        select id, prodId, sort, delFlag, createUser, createTime, updateUser, updateTime from t_suggest_prod
+    </sql>
+
+    <sql id="selectSuggestProdExt">
+        select
+            ${tableAlias}.id,
+            ${tableAlias}.prodId,
+            ${tableAlias}.sort,
+            ${tableAlias}.delFlag,
+            ${tableAlias}.createUser,
+            ${tableAlias}.createTime,
+            ${tableAlias}.updateUser,
+            ${tableAlias}.updateTime
+        from t_suggest_prod ${tableAlias}
+    </sql>
+
+    <select id="selectSuggestProdList" parameterType="SuggestProd" resultMap="SuggestProdResult">
+        <include refid="selectSuggestProd"/>
+        <where>  
+            <if test="prodId != null "> and prodId = #{prodId}</if>
+            <if test="sort != null "> and sort = #{sort}</if>
+            <if test="delFlag != null  and delFlag != ''"> and delFlag = #{delFlag}</if>
+            <if test="createUser != null  and createUser != ''"> and createUser = #{createUser}</if>
+            <if test="createTime != null "> and createTime = #{createTime}</if>
+            <if test="updateUser != null  and updateUser != ''"> and updateUser = #{updateUser}</if>
+            <if test="updateTime != null "> and updateTime = #{updateTime}</if>
+        </where>
+    </select>
+    
+    <select id="selectSuggestProdById" parameterType="Long" resultMap="SuggestProdResult">
+        <include refid="selectSuggestProd"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertSuggestProd" parameterType="SuggestProd" useGeneratedKeys="true" keyProperty="id">
+        insert into t_suggest_prod
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="prodId != null">prodId,</if>
+            <if test="sort != null">sort,</if>
+            <if test="delFlag != null">delFlag,</if>
+            <if test="createUser != null">createUser,</if>
+            <if test="createTime != null">createTime,</if>
+            <if test="updateUser != null">updateUser,</if>
+            <if test="updateTime != null">updateTime,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="prodId != null">#{prodId},</if>
+            <if test="sort != null">#{sort},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createUser != null">#{createUser},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateUser != null">#{updateUser},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+         </trim>
+    </insert>
+
+    <insert id="batchInsertSuggestProd">
+        insert into t_suggest_prod( prodId, sort, delFlag, createUser, createTime, updateUser, updateTime) values
+        <foreach item="item" index="index" collection="list" separator=",">
+            ( #{item.prodId}, #{item.sort}, #{item.delFlag}, #{item.createUser}, #{item.createTime}, #{item.updateUser}, #{item.updateTime})
+        </foreach>
+    </insert>
+
+    <update id="updateSuggestProd" parameterType="SuggestProd">
+        update t_suggest_prod
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="prodId != null">prodId = #{prodId},</if>
+            <if test="sort != null">sort = #{sort},</if>
+            <if test="delFlag != null">delFlag = #{delFlag},</if>
+            <if test="createUser != null">createUser = #{createUser},</if>
+            <if test="createTime != null">createTime = #{createTime},</if>
+            <if test="updateUser != null">updateUser = #{updateUser},</if>
+            <if test="updateTime != null">updateTime = #{updateTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteSuggestProdById" parameterType="Long">
+        delete from t_suggest_prod where id = #{id}
+    </delete>
+
+    <delete id="deleteSuggestProdByIds" parameterType="String">
+        delete from t_suggest_prod where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+    <update id="logicDeleteSuggestProdById" parameterType="Long">
+        update t_suggest_prod
+            set delFlag = '1'
+        where id = #{id}
+    </update>
+
+    <update id="logicDeleteSuggestProdByIds" parameterType="String">
+        update t_suggest_prod
+        set delFlag = '1'
+        where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+
+    <update id="logicDeleteSuggestProdByCondition" parameterType="SuggestProd">
+        update t_suggest_prod
+        set delFlag = '1'
+        <where>
+            <if test="prodId != null "> and prodId = #{prodId}</if>
+            <if test="sort != null "> and sort = #{sort}</if>
+            <if test="delFlag != null  and delFlag != ''"> and delFlag = #{delFlag}</if>
+            <if test="createUser != null  and createUser != ''"> and createUser = #{createUser}</if>
+            <if test="createTime != null "> and createTime = #{createTime}</if>
+            <if test="updateUser != null  and updateUser != ''"> and updateUser = #{updateUser}</if>
+            <if test="updateTime != null "> and updateTime = #{updateTime}</if>
+        </where>
+    </update>
+</mapper>

08.src/Xingxi/xingxi-system/src/main/resources/mapper/business/UserAddressMapper.xml

@@ -0,0 +1,174 @@
+<?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.xingxi.business.UserAddress.mapper.UserAddressMapper">
+    <resultMap type="UserAddress" id="UserAddressResult">
+        <result property="userAddressId"    column="userAddressId"    />
+        <result property="userId"    column="user_id"    />
+        <result property="mobile"    column="mobile"    />
+        <result property="recipient"    column="recipient"    />
+        <result property="province"    column="province"    />
+        <result property="city"    column="city"    />
+        <result property="district"    column="district"    />
+        <result property="address"    column="address"    />
+        <result property="defaultFlag"    column="defaultFlag"    />
+        <result property="delFlag"    column="delFlag"    />
+        <result property="createUser"    column="createUser"    />
+        <result property="createTime"    column="createTime"    />
+        <result property="updateUser"    column="updateUser"    />
+        <result property="updateTime"    column="updateTime"    />
+    </resultMap>
+
+    <sql id="selectUserAddress">
+        select userAddressId, user_id, mobile, recipient, province, city, district, address, defaultFlag, delFlag, createUser, createTime, updateUser, updateTime from t_user_address
+    </sql>
+
+    <sql id="selectUserAddressExt">
+        select
+            ${tableAlias}.userAddressId,
+            ${tableAlias}.user_id,
+            ${tableAlias}.mobile,
+            ${tableAlias}.recipient,
+            ${tableAlias}.province,
+            ${tableAlias}.city,
+            ${tableAlias}.district,
+            ${tableAlias}.address,
+            ${tableAlias}.defaultFlag,
+            ${tableAlias}.delFlag,
+            ${tableAlias}.createUser,
+            ${tableAlias}.createTime,
+            ${tableAlias}.updateUser,
+            ${tableAlias}.updateTime
+        from t_user_address ${tableAlias}
+    </sql>
+
+    <select id="selectUserAddressList" parameterType="UserAddress" resultMap="UserAddressResult">
+        <include refid="selectUserAddress"/>
+        <where>  
+            <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="mobile != null  and mobile != ''"> and mobile = #{mobile}</if>
+            <if test="recipient != null  and recipient != ''"> and recipient = #{recipient}</if>
+            <if test="province != null  and province != ''"> and province = #{province}</if>
+            <if test="city != null  and city != ''"> and city = #{city}</if>
+            <if test="district != null  and district != ''"> and district = #{district}</if>
+            <if test="address != null  and address != ''"> and address = #{address}</if>
+            <if test="defaultFlag != null  and defaultFlag != ''"> and defaultFlag = #{defaultFlag}</if>
+            <if test="delFlag != null  and delFlag != ''"> and delFlag = #{delFlag}</if>
+            <if test="createUser != null  and createUser != ''"> and createUser = #{createUser}</if>
+            <if test="createTime != null "> and createTime = #{createTime}</if>
+            <if test="updateUser != null  and updateUser != ''"> and updateUser = #{updateUser}</if>
+            <if test="updateTime != null "> and updateTime = #{updateTime}</if>
+        </where>
+    </select>
+    
+    <select id="selectUserAddressByUserAddressId" parameterType="Long" resultMap="UserAddressResult">
+        <include refid="selectUserAddress"/>
+        where userAddressId = #{userAddressId}
+    </select>
+        
+    <insert id="insertUserAddress" parameterType="UserAddress" useGeneratedKeys="true" keyProperty="userAddressId">
+        insert into t_user_address
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="userId != null">user_id,</if>
+            <if test="mobile != null">mobile,</if>
+            <if test="recipient != null">recipient,</if>
+            <if test="province != null">province,</if>
+            <if test="city != null">city,</if>
+            <if test="district != null">district,</if>
+            <if test="address != null">address,</if>
+            <if test="defaultFlag != null">defaultFlag,</if>
+            <if test="delFlag != null">delFlag,</if>
+            <if test="createUser != null">createUser,</if>
+            <if test="createTime != null">createTime,</if>
+            <if test="updateUser != null">updateUser,</if>
+            <if test="updateTime != null">updateTime,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="userId != null">#{userId},</if>
+            <if test="mobile != null">#{mobile},</if>
+            <if test="recipient != null">#{recipient},</if>
+            <if test="province != null">#{province},</if>
+            <if test="city != null">#{city},</if>
+            <if test="district != null">#{district},</if>
+            <if test="address != null">#{address},</if>
+            <if test="defaultFlag != null">#{defaultFlag},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createUser != null">#{createUser},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateUser != null">#{updateUser},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+         </trim>
+    </insert>
+
+    <insert id="batchInsertUserAddress">
+        insert into t_user_address( user_id, mobile, recipient, province, city, district, address, defaultFlag, delFlag, createUser, createTime, updateUser, updateTime) values
+        <foreach item="item" index="index" collection="list" separator=",">
+            ( #{item.userId}, #{item.mobile}, #{item.recipient}, #{item.province}, #{item.city}, #{item.district}, #{item.address}, #{item.defaultFlag}, #{item.delFlag}, #{item.createUser}, #{item.createTime}, #{item.updateUser}, #{item.updateTime})
+        </foreach>
+    </insert>
+
+    <update id="updateUserAddress" parameterType="UserAddress">
+        update t_user_address
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="userId != null">user_id = #{userId},</if>
+            <if test="mobile != null">mobile = #{mobile},</if>
+            <if test="recipient != null">recipient = #{recipient},</if>
+            <if test="province != null">province = #{province},</if>
+            <if test="city != null">city = #{city},</if>
+            <if test="district != null">district = #{district},</if>
+            <if test="address != null">address = #{address},</if>
+            <if test="defaultFlag != null">defaultFlag = #{defaultFlag},</if>
+            <if test="delFlag != null">delFlag = #{delFlag},</if>
+            <if test="createUser != null">createUser = #{createUser},</if>
+            <if test="createTime != null">createTime = #{createTime},</if>
+            <if test="updateUser != null">updateUser = #{updateUser},</if>
+            <if test="updateTime != null">updateTime = #{updateTime},</if>
+        </trim>
+        where userAddressId = #{userAddressId}
+    </update>
+
+    <delete id="deleteUserAddressByUserAddressId" parameterType="Long">
+        delete from t_user_address where userAddressId = #{userAddressId}
+    </delete>
+
+    <delete id="deleteUserAddressByUserAddressIds" parameterType="String">
+        delete from t_user_address where userAddressId in 
+        <foreach item="userAddressId" collection="array" open="(" separator="," close=")">
+            #{userAddressId}
+        </foreach>
+    </delete>
+
+    <update id="logicDeleteUserAddressByUserAddressId" parameterType="Long">
+        update t_user_address
+            set delFlag = '1'
+        where userAddressId = #{userAddressId}
+    </update>
+
+    <update id="logicDeleteUserAddressByUserAddressIds" parameterType="String">
+        update t_user_address
+        set delFlag = '1'
+        where userAddressId in
+        <foreach item="userAddressId" collection="array" open="(" separator="," close=")">
+            #{userAddressId}
+        </foreach>
+    </update>
+
+    <update id="logicDeleteUserAddressByCondition" parameterType="UserAddress">
+        update t_user_address
+        set delFlag = '1'
+        <where>
+            <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="mobile != null  and mobile != ''"> and mobile = #{mobile}</if>
+            <if test="recipient != null  and recipient != ''"> and recipient = #{recipient}</if>
+            <if test="province != null  and province != ''"> and province = #{province}</if>
+            <if test="city != null  and city != ''"> and city = #{city}</if>
+            <if test="district != null  and district != ''"> and district = #{district}</if>
+            <if test="address != null  and address != ''"> and address = #{address}</if>
+            <if test="defaultFlag != null  and defaultFlag != ''"> and defaultFlag = #{defaultFlag}</if>
+            <if test="delFlag != null  and delFlag != ''"> and delFlag = #{delFlag}</if>
+            <if test="createUser != null  and createUser != ''"> and createUser = #{createUser}</if>
+            <if test="createTime != null "> and createTime = #{createTime}</if>
+            <if test="updateUser != null  and updateUser != ''"> and updateUser = #{updateUser}</if>
+            <if test="updateTime != null "> and updateTime = #{updateTime}</if>
+        </where>
+    </update>
+</mapper>

08.src/Xingxi/xingxi-system/src/main/resources/mapper/business/UserFollowMapper.xml

@@ -0,0 +1,153 @@
+<?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.xingxi.business.UserFollow.mapper.UserFollowMapper">
+    <resultMap type="UserFollow" id="UserFollowResult">
+        <result property="userFollowId"    column="userFollowId"    />
+        <result property="folllowType"    column="folllowType"    />
+        <result property="followTime"    column="followTime"    />
+        <result property="userId"    column="user_id"    />
+        <result property="prodId"    column="prodId"    />
+        <result property="designerId"    column="designerId"    />
+        <result property="delFlag"    column="delFlag"    />
+        <result property="createUser"    column="createUser"    />
+        <result property="createTime"    column="createTime"    />
+        <result property="updateUser"    column="updateUser"    />
+        <result property="updateTime"    column="updateTime"    />
+    </resultMap>
+
+    <sql id="selectUserFollow">
+        select userFollowId, folllowType, followTime, user_id, prodId, designerId, delFlag, createUser, createTime, updateUser, updateTime from t_user_follow
+    </sql>
+
+    <sql id="selectUserFollowExt">
+        select
+            ${tableAlias}.userFollowId,
+            ${tableAlias}.folllowType,
+            ${tableAlias}.followTime,
+            ${tableAlias}.user_id,
+            ${tableAlias}.prodId,
+            ${tableAlias}.designerId,
+            ${tableAlias}.delFlag,
+            ${tableAlias}.createUser,
+            ${tableAlias}.createTime,
+            ${tableAlias}.updateUser,
+            ${tableAlias}.updateTime
+        from t_user_follow ${tableAlias}
+    </sql>
+
+    <select id="selectUserFollowList" parameterType="UserFollow" resultMap="UserFollowResult">
+        <include refid="selectUserFollow"/>
+        <where>  
+            <if test="folllowType != null  and folllowType != ''"> and folllowType = #{folllowType}</if>
+            <if test="followTime != null "> and followTime = #{followTime}</if>
+            <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="prodId != null "> and prodId = #{prodId}</if>
+            <if test="designerId != null "> and designerId = #{designerId}</if>
+            <if test="delFlag != null  and delFlag != ''"> and delFlag = #{delFlag}</if>
+            <if test="createUser != null  and createUser != ''"> and createUser = #{createUser}</if>
+            <if test="createTime != null "> and createTime = #{createTime}</if>
+            <if test="updateUser != null  and updateUser != ''"> and updateUser = #{updateUser}</if>
+            <if test="updateTime != null "> and updateTime = #{updateTime}</if>
+        </where>
+    </select>
+    
+    <select id="selectUserFollowByUserFollowId" parameterType="Long" resultMap="UserFollowResult">
+        <include refid="selectUserFollow"/>
+        where userFollowId = #{userFollowId}
+    </select>
+        
+    <insert id="insertUserFollow" parameterType="UserFollow" useGeneratedKeys="true" keyProperty="userFollowId">
+        insert into t_user_follow
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="folllowType != null">folllowType,</if>
+            <if test="followTime != null">followTime,</if>
+            <if test="userId != null">user_id,</if>
+            <if test="prodId != null">prodId,</if>
+            <if test="designerId != null">designerId,</if>
+            <if test="delFlag != null">delFlag,</if>
+            <if test="createUser != null">createUser,</if>
+            <if test="createTime != null">createTime,</if>
+            <if test="updateUser != null">updateUser,</if>
+            <if test="updateTime != null">updateTime,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="folllowType != null">#{folllowType},</if>
+            <if test="followTime != null">#{followTime},</if>
+            <if test="userId != null">#{userId},</if>
+            <if test="prodId != null">#{prodId},</if>
+            <if test="designerId != null">#{designerId},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createUser != null">#{createUser},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateUser != null">#{updateUser},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+         </trim>
+    </insert>
+
+    <insert id="batchInsertUserFollow">
+        insert into t_user_follow( folllowType, followTime, user_id, prodId, designerId, delFlag, createUser, createTime, updateUser, updateTime) values
+        <foreach item="item" index="index" collection="list" separator=",">
+            ( #{item.folllowType}, #{item.followTime}, #{item.userId}, #{item.prodId}, #{item.designerId}, #{item.delFlag}, #{item.createUser}, #{item.createTime}, #{item.updateUser}, #{item.updateTime})
+        </foreach>
+    </insert>
+
+    <update id="updateUserFollow" parameterType="UserFollow">
+        update t_user_follow
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="folllowType != null">folllowType = #{folllowType},</if>
+            <if test="followTime != null">followTime = #{followTime},</if>
+            <if test="userId != null">user_id = #{userId},</if>
+            <if test="prodId != null">prodId = #{prodId},</if>
+            <if test="designerId != null">designerId = #{designerId},</if>
+            <if test="delFlag != null">delFlag = #{delFlag},</if>
+            <if test="createUser != null">createUser = #{createUser},</if>
+            <if test="createTime != null">createTime = #{createTime},</if>
+            <if test="updateUser != null">updateUser = #{updateUser},</if>
+            <if test="updateTime != null">updateTime = #{updateTime},</if>
+        </trim>
+        where userFollowId = #{userFollowId}
+    </update>
+
+    <delete id="deleteUserFollowByUserFollowId" parameterType="Long">
+        delete from t_user_follow where userFollowId = #{userFollowId}
+    </delete>
+
+    <delete id="deleteUserFollowByUserFollowIds" parameterType="String">
+        delete from t_user_follow where userFollowId in 
+        <foreach item="userFollowId" collection="array" open="(" separator="," close=")">
+            #{userFollowId}
+        </foreach>
+    </delete>
+
+    <update id="logicDeleteUserFollowByUserFollowId" parameterType="Long">
+        update t_user_follow
+            set delFlag = '1'
+        where userFollowId = #{userFollowId}
+    </update>
+
+    <update id="logicDeleteUserFollowByUserFollowIds" parameterType="String">
+        update t_user_follow
+        set delFlag = '1'
+        where userFollowId in
+        <foreach item="userFollowId" collection="array" open="(" separator="," close=")">
+            #{userFollowId}
+        </foreach>
+    </update>
+
+    <update id="logicDeleteUserFollowByCondition" parameterType="UserFollow">
+        update t_user_follow
+        set delFlag = '1'
+        <where>
+            <if test="folllowType != null  and folllowType != ''"> and folllowType = #{folllowType}</if>
+            <if test="followTime != null "> and followTime = #{followTime}</if>
+            <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="prodId != null "> and prodId = #{prodId}</if>
+            <if test="designerId != null "> and designerId = #{designerId}</if>
+            <if test="delFlag != null  and delFlag != ''"> and delFlag = #{delFlag}</if>
+            <if test="createUser != null  and createUser != ''"> and createUser = #{createUser}</if>
+            <if test="createTime != null "> and createTime = #{createTime}</if>
+            <if test="updateUser != null  and updateUser != ''"> and updateUser = #{updateUser}</if>
+            <if test="updateTime != null "> and updateTime = #{updateTime}</if>
+        </where>
+    </update>
+</mapper>

08.src/Xingxi/xingxi-system/src/main/resources/mapper/business/UserRefuseTagMapper.xml

@@ -0,0 +1,132 @@
+<?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.xingxi.business.UserRefuseTag.mapper.UserRefuseTagMapper">
+    <resultMap type="UserRefuseTag" id="UserRefuseTagResult">
+        <result property="userRefuseid"    column="userRefuseid"    />
+        <result property="userId"    column="user_id"    />
+        <result property="tagId"    column="tagId"    />
+        <result property="delFlag"    column="delFlag"    />
+        <result property="createUser"    column="createUser"    />
+        <result property="createTime"    column="createTime"    />
+        <result property="updateUser"    column="updateUser"    />
+        <result property="updateTime"    column="updateTime"    />
+    </resultMap>
+
+    <sql id="selectUserRefuseTag">
+        select userRefuseid, user_id, tagId, delFlag, createUser, createTime, updateUser, updateTime from t_user_refuse_tag
+    </sql>
+
+    <sql id="selectUserRefuseTagExt">
+        select
+            ${tableAlias}.userRefuseid,
+            ${tableAlias}.user_id,
+            ${tableAlias}.tagId,
+            ${tableAlias}.delFlag,
+            ${tableAlias}.createUser,
+            ${tableAlias}.createTime,
+            ${tableAlias}.updateUser,
+            ${tableAlias}.updateTime
+        from t_user_refuse_tag ${tableAlias}
+    </sql>
+
+    <select id="selectUserRefuseTagList" parameterType="UserRefuseTag" resultMap="UserRefuseTagResult">
+        <include refid="selectUserRefuseTag"/>
+        <where>  
+            <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="tagId != null "> and tagId = #{tagId}</if>
+            <if test="delFlag != null  and delFlag != ''"> and delFlag = #{delFlag}</if>
+            <if test="createUser != null  and createUser != ''"> and createUser = #{createUser}</if>
+            <if test="createTime != null "> and createTime = #{createTime}</if>
+            <if test="updateUser != null  and updateUser != ''"> and updateUser = #{updateUser}</if>
+            <if test="updateTime != null "> and updateTime = #{updateTime}</if>
+        </where>
+    </select>
+    
+    <select id="selectUserRefuseTagByUserRefuseid" parameterType="Long" resultMap="UserRefuseTagResult">
+        <include refid="selectUserRefuseTag"/>
+        where userRefuseid = #{userRefuseid}
+    </select>
+        
+    <insert id="insertUserRefuseTag" parameterType="UserRefuseTag" useGeneratedKeys="true" keyProperty="userRefuseid">
+        insert into t_user_refuse_tag
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="userId != null">user_id,</if>
+            <if test="tagId != null">tagId,</if>
+            <if test="delFlag != null">delFlag,</if>
+            <if test="createUser != null">createUser,</if>
+            <if test="createTime != null">createTime,</if>
+            <if test="updateUser != null">updateUser,</if>
+            <if test="updateTime != null">updateTime,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="userId != null">#{userId},</if>
+            <if test="tagId != null">#{tagId},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createUser != null">#{createUser},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateUser != null">#{updateUser},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+         </trim>
+    </insert>
+
+    <insert id="batchInsertUserRefuseTag">
+        insert into t_user_refuse_tag( user_id, tagId, delFlag, createUser, createTime, updateUser, updateTime) values
+        <foreach item="item" index="index" collection="list" separator=",">
+            ( #{item.userId}, #{item.tagId}, #{item.delFlag}, #{item.createUser}, #{item.createTime}, #{item.updateUser}, #{item.updateTime})
+        </foreach>
+    </insert>
+
+    <update id="updateUserRefuseTag" parameterType="UserRefuseTag">
+        update t_user_refuse_tag
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="userId != null">user_id = #{userId},</if>
+            <if test="tagId != null">tagId = #{tagId},</if>
+            <if test="delFlag != null">delFlag = #{delFlag},</if>
+            <if test="createUser != null">createUser = #{createUser},</if>
+            <if test="createTime != null">createTime = #{createTime},</if>
+            <if test="updateUser != null">updateUser = #{updateUser},</if>
+            <if test="updateTime != null">updateTime = #{updateTime},</if>
+        </trim>
+        where userRefuseid = #{userRefuseid}
+    </update>
+
+    <delete id="deleteUserRefuseTagByUserRefuseid" parameterType="Long">
+        delete from t_user_refuse_tag where userRefuseid = #{userRefuseid}
+    </delete>
+
+    <delete id="deleteUserRefuseTagByUserRefuseids" parameterType="String">
+        delete from t_user_refuse_tag where userRefuseid in 
+        <foreach item="userRefuseid" collection="array" open="(" separator="," close=")">
+            #{userRefuseid}
+        </foreach>
+    </delete>
+
+    <update id="logicDeleteUserRefuseTagByUserRefuseid" parameterType="Long">
+        update t_user_refuse_tag
+            set delFlag = '1'
+        where userRefuseid = #{userRefuseid}
+    </update>
+
+    <update id="logicDeleteUserRefuseTagByUserRefuseids" parameterType="String">
+        update t_user_refuse_tag
+        set delFlag = '1'
+        where userRefuseid in
+        <foreach item="userRefuseid" collection="array" open="(" separator="," close=")">
+            #{userRefuseid}
+        </foreach>
+    </update>
+
+    <update id="logicDeleteUserRefuseTagByCondition" parameterType="UserRefuseTag">
+        update t_user_refuse_tag
+        set delFlag = '1'
+        <where>
+            <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="tagId != null "> and tagId = #{tagId}</if>
+            <if test="delFlag != null  and delFlag != ''"> and delFlag = #{delFlag}</if>
+            <if test="createUser != null  and createUser != ''"> and createUser = #{createUser}</if>
+            <if test="createTime != null "> and createTime = #{createTime}</if>
+            <if test="updateUser != null  and updateUser != ''"> and updateUser = #{updateUser}</if>
+            <if test="updateTime != null "> and updateTime = #{updateTime}</if>
+        </where>
+    </update>
+</mapper>