Merge remote-tracking branch 'origin/master'

ruoyi-admin/src/main/java/com/ruoyi/web/controller/doumu/DoumuEvaluateController.java

@@ -0,0 +1,104 @@
+package com.ruoyi.web.controller.doumu;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.system.domain.DoumuEvaluate;
+import com.ruoyi.system.service.IDoumuEvaluateService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 订单评价Controller
+ * 
+ * @author boman
+ * @date 2024-01-22
+ */
+@RestController
+@RequestMapping("/system/evaluate")
+public class DoumuEvaluateController extends BaseController
+{
+    @Autowired
+    private IDoumuEvaluateService doumuEvaluateService;
+
+    /**
+     * 查询订单评价列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:evaluate:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(DoumuEvaluate doumuEvaluate)
+    {
+        startPage();
+        List<DoumuEvaluate> list = doumuEvaluateService.selectDoumuEvaluateList(doumuEvaluate);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出订单评价列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:evaluate:export')")
+    @Log(title = "订单评价", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, DoumuEvaluate doumuEvaluate)
+    {
+        List<DoumuEvaluate> list = doumuEvaluateService.selectDoumuEvaluateList(doumuEvaluate);
+        ExcelUtil<DoumuEvaluate> util = new ExcelUtil<DoumuEvaluate>(DoumuEvaluate.class);
+        util.exportExcel(response, list, "订单评价数据");
+    }
+
+    /**
+     * 获取订单评价详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:evaluate:query')")
+    @GetMapping(value = "/{evaluateId}")
+    public AjaxResult getInfo(@PathVariable("evaluateId") Long evaluateId)
+    {
+        return success(doumuEvaluateService.selectDoumuEvaluateByEvaluateId(evaluateId));
+    }
+
+    /**
+     * 新增订单评价
+     */
+    @PreAuthorize("@ss.hasPermi('system:evaluate:add')")
+    @Log(title = "订单评价", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody DoumuEvaluate doumuEvaluate)
+    {
+        return toAjax(doumuEvaluateService.insertDoumuEvaluate(doumuEvaluate));
+    }
+
+    /**
+     * 修改订单评价
+     */
+    @PreAuthorize("@ss.hasPermi('system:evaluate:edit')")
+    @Log(title = "订单评价", businessType = BusinessType.UPDATE)
+    @PostMapping("/put")
+    public AjaxResult edit(@RequestBody DoumuEvaluate doumuEvaluate)
+    {
+        return toAjax(doumuEvaluateService.updateDoumuEvaluate(doumuEvaluate));
+    }
+
+    /**
+     * 删除订单评价
+     */
+    @PreAuthorize("@ss.hasPermi('system:evaluate:remove')")
+    @Log(title = "订单评价", businessType = BusinessType.DELETE)
+	@GetMapping("/delete/{evaluateIds}")
+    public AjaxResult remove(@PathVariable Long[] evaluateIds)
+    {
+        return toAjax(doumuEvaluateService.deleteDoumuEvaluateByEvaluateIds(evaluateIds));
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/doumu/StatisticsController.java

@@ -35,4 +35,14 @@ public class StatisticsController {
     {
         return doumuProductInfoService.monthLink();
     }
+
+    /**
+     * pc首页作品数量与销售金额统计
+     */
+    @PreAuthorize("@ss.hasPermi('system:statistics:numAmount')")
+    @GetMapping(value = "/numAmount")
+    public AjaxResult numAmount()
+    {
+        return doumuProductInfoService.numAmount();
+    }
 }

ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java

@@ -189,7 +189,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
 
 
     /***
-     * 获取本周、本月、当前季度、年度的开始时间
+     * 获取当天、本周、本月、当前季度、年度的开始时间
      * @param dateType 1：当天，2：本周，3：本月，4：当前季度，5：年度
      * @return （yyyy-MM-dd）
      */
@@ -242,4 +242,22 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
         return resDate;
     }
 
+
+    /***
+     * 获取月份的开始时间与结束时间
+     * @param type 1：开始，2：结束
+     * @return （yyyy-MM-dd）
+     */
+
+    public static String getMonthTime(int year,int month,String type) {
+        LocalDate start = LocalDate.of(year, month, 1);
+        LocalDate end = start.withDayOfMonth(start.lengthOfMonth());
+        if("1".equals(type)){
+            return start.toString();
+        }else if("2".equals(type)){
+            return end.toString();
+        }
+        return "";
+    }
+
 }

ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java

@@ -5,7 +5,6 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 
-import jdk.internal.util.Preconditions;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;

ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java

@@ -112,7 +112,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 .authorizeRequests()
                 // 对于登录login 注册register 验证码captchaImage 允许匿名访问
                 .antMatchers("/login", "/register", "/captchaImage").permitAll()
-                .antMatchers("/new/news/**", "/wx/pay/**", "/ali/pay/**","/sf/**","/china/area/fractionation/**").permitAll()
+                .antMatchers("/new/news/**", "/wx/pay/**", "/ali/pay/**","/sf/**","/china/area/fractionation/**","/common/upload","/system/info").permitAll()
                 // 静态资源，可匿名访问
                 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
                 .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()

ruoyi-system/src/main/java/com/ruoyi/system/domain/DoumuEvaluate.java

@@ -0,0 +1,139 @@
+package com.ruoyi.system.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+import java.util.List;
+
+/**
+ * 订单评价对象 doumu_evaluate
+ * 
+ * @author boman
+ * @date 2024-01-22
+ */
+public class DoumuEvaluate extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    private Long evaluateId;
+
+    /** 痘姆古陶主表id（doumu_product_info） */
+    @Excel(name = "痘姆古陶主表id", readConverterExp = "d=oumu_product_info")
+    private Long productId;
+
+    /** 订单号 */
+    @Excel(name = "订单号")
+    private String orderNumber;
+
+    /** 1：差评，2：中评，3：好评 */
+    @Excel(name = "1：差评，2：中评，3：好评")
+    private String synthesisEvaluate;
+
+    /** 1:1星，2:2星，3:3星，4:4星，5:5星 */
+    @Excel(name = "1:1星，2:2星，3:3星，4:4星，5:5星")
+    private String productEvaluate;
+
+    /** 1:1星，2:2星，3:3星，4:4星，5:5星 */
+    @Excel(name = "1:1星，2:2星，3:3星，4:4星，5:5星")
+    private String serviceEvaluate;
+
+    /** 1:1星，2:2星，3:3星，4:4星，5:5星 */
+    @Excel(name = "1:1星，2:2星，3:3星，4:4星，5:5星")
+    private String flowEvaluate;
+
+    private List<DoumuProductFj> fjList;
+
+
+    public List<DoumuProductFj> getFjList() {
+        return fjList;
+    }
+
+    public void setFjList(List<DoumuProductFj> fjList) {
+        this.fjList = fjList;
+    }
+
+    public void setEvaluateId(Long evaluateId)
+    {
+        this.evaluateId = evaluateId;
+    }
+
+    public Long getEvaluateId() 
+    {
+        return evaluateId;
+    }
+    public void setProductId(Long productId) 
+    {
+        this.productId = productId;
+    }
+
+    public Long getProductId() 
+    {
+        return productId;
+    }
+    public void setOrderNumber(String orderNumber) 
+    {
+        this.orderNumber = orderNumber;
+    }
+
+    public String getOrderNumber() 
+    {
+        return orderNumber;
+    }
+    public void setSynthesisEvaluate(String synthesisEvaluate) 
+    {
+        this.synthesisEvaluate = synthesisEvaluate;
+    }
+
+    public String getSynthesisEvaluate() 
+    {
+        return synthesisEvaluate;
+    }
+    public void setProductEvaluate(String productEvaluate) 
+    {
+        this.productEvaluate = productEvaluate;
+    }
+
+    public String getProductEvaluate() 
+    {
+        return productEvaluate;
+    }
+    public void setServiceEvaluate(String serviceEvaluate) 
+    {
+        this.serviceEvaluate = serviceEvaluate;
+    }
+
+    public String getServiceEvaluate() 
+    {
+        return serviceEvaluate;
+    }
+    public void setFlowEvaluate(String flowEvaluate) 
+    {
+        this.flowEvaluate = flowEvaluate;
+    }
+
+    public String getFlowEvaluate() 
+    {
+        return flowEvaluate;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("evaluateId", getEvaluateId())
+            .append("productId", getProductId())
+            .append("orderNumber", getOrderNumber())
+            .append("synthesisEvaluate", getSynthesisEvaluate())
+            .append("productEvaluate", getProductEvaluate())
+            .append("serviceEvaluate", getServiceEvaluate())
+            .append("flowEvaluate", getFlowEvaluate())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/domain/DoumuProductFj.java

@@ -6,7 +6,7 @@ import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
- * 痘姆古陶_附件对象 doumu_product_fi
+ * 痘姆古陶_附件对象 doumu_product_fj
  * 
  * @author boman
  * @date 2024-01-16
@@ -30,7 +30,21 @@ public class DoumuProductFj extends BaseEntity
     @Excel(name = "附件地址")
     private String path;
 
-    public void setFiId(Long fiId) 
+    /** 1：客户上传，2：管理员上传 */
+    private String type;
+
+    /** 1：订单附件，2：评价附件 */
+    private String module;
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public void setFiId(Long fiId)
     {
         this.fiId = fiId;
     }
@@ -67,6 +81,14 @@ public class DoumuProductFj extends BaseEntity
         return path;
     }
 
+    public String getModule() {
+        return module;
+    }
+
+    public void setModule(String module) {
+        this.module = module;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

ruoyi-system/src/main/java/com/ruoyi/system/domain/DoumuProductHistory.java

@@ -5,6 +5,8 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 
+import java.util.List;
+
 /**
  * 痘姆古陶主历史信息对象 doumu_product_history
  * 
@@ -22,6 +24,9 @@ public class DoumuProductHistory extends BaseEntity
     @Excel(name = "痘姆古陶主表id", readConverterExp = "d=oumu_product_info")
     private Long productId;
 
+    /** 微信标识 */
+    private String openid;
+
     /** 订单号 */
     @Excel(name = "订单号")
     private String orderNumber;
@@ -80,12 +85,73 @@ public class DoumuProductHistory extends BaseEntity
     @Excel(name = "订单状态", readConverterExp = "1=未支付,2=已支付,3=已结束")
     private String status;
 
+    /** 商品名称 */
+    @Excel(name = "商品名称")
+    private String goodsName;
+
+    /** 订单金额（元） */
+    @Excel(name = "订单金额（元）")
+    private Double totalPrice;
+
 
     /** 快递单号 */
     @Excel(name = "快递单号")
     private String mailNo;
 
-    public void setHistoryId(Long historyId) 
+    private String beginTime;
+    private String endTime;
+
+    private List<DoumuProductFj> fjList;
+
+    public String getOpenid() {
+        return openid;
+    }
+
+    public void setOpenid(String openid) {
+        this.openid = openid;
+    }
+
+    public String getGoodsName() {
+        return goodsName;
+    }
+
+    public void setGoodsName(String goodsName) {
+        this.goodsName = goodsName;
+    }
+
+    public Double getTotalPrice() {
+        return totalPrice;
+    }
+
+    public void setTotalPrice(Double totalPrice) {
+        this.totalPrice = totalPrice;
+    }
+
+    public String getBeginTime() {
+        return beginTime;
+    }
+
+    public void setBeginTime(String beginTime) {
+        this.beginTime = beginTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+
+    public List<DoumuProductFj> getFjList() {
+        return fjList;
+    }
+
+    public void setFjList(List<DoumuProductFj> fjList) {
+        this.fjList = fjList;
+    }
+
+    public void setHistoryId(Long historyId)
     {
         this.historyId = historyId;
     }

ruoyi-system/src/main/java/com/ruoyi/system/domain/DoumuProductInfo.java

@@ -18,6 +18,8 @@ public class DoumuProductInfo extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** ID */
+    private Long historyId;
+
     private Long productId;
 
     /** 微信标识 */
@@ -102,6 +104,24 @@ public class DoumuProductInfo extends BaseEntity
 
     private List<DoumuProductFj> fjList;
 
+    private DoumuEvaluate doumuEvaluate;
+
+    public DoumuEvaluate getDoumuEvaluate() {
+        return doumuEvaluate;
+    }
+
+    public void setDoumuEvaluate(DoumuEvaluate doumuEvaluate) {
+        this.doumuEvaluate = doumuEvaluate;
+    }
+
+    public Long getHistoryId() {
+        return historyId;
+    }
+
+    public void setHistoryId(Long historyId) {
+        this.historyId = historyId;
+    }
+
     public List<DoumuProductFj> getFjList() {
         return fjList;
     }

ruoyi-system/src/main/java/com/ruoyi/system/mapper/DoumuEvaluateMapper.java

@@ -0,0 +1,63 @@
+package com.ruoyi.system.mapper;
+
+import java.util.List;
+import com.ruoyi.system.domain.DoumuEvaluate;
+
+/**
+ * 订单评价Mapper接口
+ * 
+ * @author boman
+ * @date 2024-01-22
+ */
+public interface DoumuEvaluateMapper 
+{
+    /**
+     * 查询订单评价
+     * 
+     * @param evaluateId 订单评价主键
+     * @return 订单评价
+     */
+    public DoumuEvaluate selectDoumuEvaluateByEvaluateId(Long evaluateId);
+
+    /**
+     * 查询订单评价列表
+     * 
+     * @param doumuEvaluate 订单评价
+     * @return 订单评价集合
+     */
+    public List<DoumuEvaluate> selectDoumuEvaluateList(DoumuEvaluate doumuEvaluate);
+
+    /**
+     * 新增订单评价
+     * 
+     * @param doumuEvaluate 订单评价
+     * @return 结果
+     */
+    public int insertDoumuEvaluate(DoumuEvaluate doumuEvaluate);
+
+    /**
+     * 修改订单评价
+     * 
+     * @param doumuEvaluate 订单评价
+     * @return 结果
+     */
+    public int updateDoumuEvaluate(DoumuEvaluate doumuEvaluate);
+
+    /**
+     * 删除订单评价
+     * 
+     * @param evaluateId 订单评价主键
+     * @return 结果
+     */
+    public int deleteDoumuEvaluateByEvaluateId(Long evaluateId);
+
+    /**
+     * 批量删除订单评价
+     * 
+     * @param evaluateIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteDoumuEvaluateByEvaluateIds(Long[] evaluateIds);
+
+    DoumuEvaluate selectDoumuEvaluateByProductId(Long productId);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/IDoumuEvaluateService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.system.service;
+
+import java.util.List;
+import com.ruoyi.system.domain.DoumuEvaluate;
+
+/**
+ * 订单评价Service接口
+ * 
+ * @author boman
+ * @date 2024-01-22
+ */
+public interface IDoumuEvaluateService 
+{
+    /**
+     * 查询订单评价
+     * 
+     * @param evaluateId 订单评价主键
+     * @return 订单评价
+     */
+    public DoumuEvaluate selectDoumuEvaluateByEvaluateId(Long evaluateId);
+
+    /**
+     * 查询订单评价列表
+     * 
+     * @param doumuEvaluate 订单评价
+     * @return 订单评价集合
+     */
+    public List<DoumuEvaluate> selectDoumuEvaluateList(DoumuEvaluate doumuEvaluate);
+
+    /**
+     * 新增订单评价
+     * 
+     * @param doumuEvaluate 订单评价
+     * @return 结果
+     */
+    public int insertDoumuEvaluate(DoumuEvaluate doumuEvaluate);
+
+    /**
+     * 修改订单评价
+     * 
+     * @param doumuEvaluate 订单评价
+     * @return 结果
+     */
+    public int updateDoumuEvaluate(DoumuEvaluate doumuEvaluate);
+
+    /**
+     * 批量删除订单评价
+     * 
+     * @param evaluateIds 需要删除的订单评价主键集合
+     * @return 结果
+     */
+    public int deleteDoumuEvaluateByEvaluateIds(Long[] evaluateIds);
+
+    /**
+     * 删除订单评价信息
+     * 
+     * @param evaluateId 订单评价主键
+     * @return 结果
+     */
+    public int deleteDoumuEvaluateByEvaluateId(Long evaluateId);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/IDoumuProductInfoService.java

@@ -67,4 +67,6 @@ public interface IDoumuProductInfoService
     AjaxResult link(String dateType);
 
     AjaxResult monthLink();
+
+    AjaxResult numAmount();
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DoumuEvaluateServiceImpl.java

@@ -0,0 +1,126 @@
+package com.ruoyi.system.service.impl;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.system.domain.DoumuProductFj;
+import com.ruoyi.system.mapper.DoumuProductFjMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.system.mapper.DoumuEvaluateMapper;
+import com.ruoyi.system.domain.DoumuEvaluate;
+import com.ruoyi.system.service.IDoumuEvaluateService;
+
+/**
+ * 订单评价Service业务层处理
+ * 
+ * @author boman
+ * @date 2024-01-22
+ */
+@Service
+public class DoumuEvaluateServiceImpl implements IDoumuEvaluateService 
+{
+    @Autowired
+    private DoumuEvaluateMapper doumuEvaluateMapper;
+
+    @Autowired
+    private DoumuProductFjMapper doumuProductFjMapper;
+
+    /**
+     * 查询订单评价
+     * 
+     * @param evaluateId 订单评价主键
+     * @return 订单评价
+     */
+    @Override
+    public DoumuEvaluate selectDoumuEvaluateByEvaluateId(Long evaluateId)
+    {
+        return doumuEvaluateMapper.selectDoumuEvaluateByEvaluateId(evaluateId);
+    }
+
+    /**
+     * 查询订单评价列表
+     * 
+     * @param doumuEvaluate 订单评价
+     * @return 订单评价
+     */
+    @Override
+    public List<DoumuEvaluate> selectDoumuEvaluateList(DoumuEvaluate doumuEvaluate)
+    {
+        return doumuEvaluateMapper.selectDoumuEvaluateList(doumuEvaluate);
+    }
+
+    /**
+     * 新增订单评价
+     * 
+     * @param doumuEvaluate 订单评价
+     * @return 结果
+     */
+    @Override
+    public int insertDoumuEvaluate(DoumuEvaluate doumuEvaluate)
+    {
+        doumuEvaluate.setCreateTime(DateUtils.getNowDate());
+        int i = doumuEvaluateMapper.insertDoumuEvaluate(doumuEvaluate);
+        //保存附件
+        List<DoumuProductFj> fjList = doumuEvaluate.getFjList();
+        if(fjList!=null && fjList.size()>0){
+            for (DoumuProductFj doumuProductFj : fjList) {
+                doumuProductFj.setProductId(doumuEvaluate.getProductId());
+                doumuProductFj.setModule("2");
+                doumuProductFjMapper.insertDoumuProductFj(doumuProductFj);
+            }
+        }
+
+        return i;
+    }
+
+    /**
+     * 修改订单评价
+     * 
+     * @param doumuEvaluate 订单评价
+     * @return 结果
+     */
+    @Override
+    public int updateDoumuEvaluate(DoumuEvaluate doumuEvaluate)
+    {
+        doumuEvaluate.setUpdateTime(DateUtils.getNowDate());
+
+        //保存附件
+        List<DoumuProductFj> fjList = doumuEvaluate.getFjList();
+        if(fjList!=null && fjList.size()>0){
+            for (DoumuProductFj doumuProductFj : fjList) {
+                //先删除附件
+                doumuProductFjMapper.deleteDoumuProductFjByFiId(doumuProductFj.getFiId());
+                //再保存附件
+                doumuProductFj.setProductId(doumuEvaluate.getProductId());
+                doumuProductFj.setModule("2");
+                doumuProductFjMapper.insertDoumuProductFj(doumuProductFj);
+            }
+        }
+
+        return doumuEvaluateMapper.updateDoumuEvaluate(doumuEvaluate);
+    }
+
+    /**
+     * 批量删除订单评价
+     * 
+     * @param evaluateIds 需要删除的订单评价主键
+     * @return 结果
+     */
+    @Override
+    public int deleteDoumuEvaluateByEvaluateIds(Long[] evaluateIds)
+    {
+        return doumuEvaluateMapper.deleteDoumuEvaluateByEvaluateIds(evaluateIds);
+    }
+
+    /**
+     * 删除订单评价信息
+     * 
+     * @param evaluateId 订单评价主键
+     * @return 结果
+     */
+    @Override
+    public int deleteDoumuEvaluateByEvaluateId(Long evaluateId)
+    {
+        return doumuEvaluateMapper.deleteDoumuEvaluateByEvaluateId(evaluateId);
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DoumuProductInfoServiceImpl.java

@@ -2,6 +2,7 @@ package com.ruoyi.system.service.impl;
 
 import java.math.BigDecimal;
 import java.text.DecimalFormat;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -11,8 +12,10 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysDictData;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.system.domain.DoumuEvaluate;
 import com.ruoyi.system.domain.DoumuProductFj;
 import com.ruoyi.system.domain.vo.DoumuProductInfoVo;
+import com.ruoyi.system.mapper.DoumuEvaluateMapper;
 import com.ruoyi.system.mapper.DoumuProductFjMapper;
 import com.ruoyi.system.mapper.SysDictDataMapper;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -39,6 +42,9 @@ public class DoumuProductInfoServiceImpl implements IDoumuProductInfoService
     @Autowired
     private SysDictDataMapper dictDataMapper;
 
+    @Autowired
+    private DoumuEvaluateMapper doumuEvaluateMapper;
+
     /**
      * 查询痘姆古陶信息
      *
@@ -54,6 +60,9 @@ public class DoumuProductInfoServiceImpl implements IDoumuProductInfoService
         doumuProductFj.setProductId(productId);
         List<DoumuProductFj> fjList = doumuProductFjMapper.selectDoumuProductFjList(doumuProductFj);
         doumuProductInfo.setFjList(fjList);
+        //查询评价信息
+        DoumuEvaluate  doumuEvaluate = doumuEvaluateMapper.selectDoumuEvaluateByProductId(productId);
+        doumuProductInfo.setDoumuEvaluate(doumuEvaluate);
         return doumuProductInfo;
     }
 
@@ -71,6 +80,7 @@ public class DoumuProductInfoServiceImpl implements IDoumuProductInfoService
             //查询附件
             DoumuProductFj doumuProductFj = new DoumuProductFj();
             doumuProductFj.setProductId(productInfo.getProductId());
+            doumuProductFj.setModule("1");
             List<DoumuProductFj> fjList = doumuProductFjMapper.selectDoumuProductFjList(doumuProductFj);
             productInfo.setFjList(fjList);
         }
@@ -95,6 +105,7 @@ public class DoumuProductInfoServiceImpl implements IDoumuProductInfoService
         if(fjList!=null && fjList.size()>0){
             for (DoumuProductFj doumuProductFj : fjList) {
                 doumuProductFj.setProductId(doumuProductInfo.getProductId());
+                doumuProductFj.setModule("1");
                 doumuProductFjMapper.insertDoumuProductFj(doumuProductFj);
             }
         }
@@ -118,8 +129,9 @@ public class DoumuProductInfoServiceImpl implements IDoumuProductInfoService
             for (DoumuProductFj doumuProductFj : fjList) {
                 //先删除附件
                 doumuProductFjMapper.deleteDoumuProductFjByFiId(doumuProductFj.getFiId());
-                //在保存附件
+                //再保存附件
                 doumuProductFj.setProductId(doumuProductInfo.getProductId());
+                doumuProductFj.setModule("1");
                 doumuProductFjMapper.insertDoumuProductFj(doumuProductFj);
             }
         }
@@ -217,7 +229,11 @@ public class DoumuProductInfoServiceImpl implements IDoumuProductInfoService
         List<DoumuProductInfo> doumuProductInfoList = doumuProductInfoMapper.selectDoumuProductInfoList(doumuProductInfo);
         if(doumuProductInfoList==null || doumuProductInfoList.size()<=0){
             for (SysDictData sysDictData : sysDictDataList) {
-                map.put(sysDictData.getDictValue(),"0%");
+                Map<String,Object> mapL = new HashMap<>();
+                mapL.put("zs",0);
+                mapL.put("lc",0);
+                mapL.put("bfb","0%");
+                map.put(sysDictData.getDictValue(),mapL);
             }
             return AjaxResult.success(map);
         }
@@ -225,20 +241,111 @@ public class DoumuProductInfoServiceImpl implements IDoumuProductInfoService
         int count = doumuProductInfoList.size();
         BigDecimal num1 = new BigDecimal(count);
         for (SysDictData sysDictData : sysDictDataList) {
+
+            Map<String,Object> mapL = new HashMap<>();
             int num = 0;
             for (DoumuProductInfo productInfo : doumuProductInfoList) {
                 if(sysDictData.getDictValue().equals(productInfo.getFlowType())){
                     num++;
                 }
             }
-            BigDecimal num2 = new BigDecimal(num);
-            double result = Double.parseDouble(((num1.divide(num2,2,BigDecimal.ROUND_HALF_UP))).toString());
-            // 创建DecimalFormat对象并设置格式化模式为"0%"
-            DecimalFormat decimalFormat = new DecimalFormat("0%");
-            // 使用DecimalFormat对象进行格式化操作
-            String percentage = decimalFormat.format((result));
-            map.put(sysDictData.getDictValue(),percentage);
+            mapL.put("zs",0);
+            mapL.put("lc",0);
+            mapL.put("bfb","0%");
+            if(num != 0){
+                BigDecimal num2 = new BigDecimal(num);
+                double result = Double.parseDouble(((num1.divide(num2,2,BigDecimal.ROUND_HALF_UP))).toString());
+                // 创建DecimalFormat对象并设置格式化模式为"0%"
+                DecimalFormat decimalFormat = new DecimalFormat("0%");
+                // 使用DecimalFormat对象进行格式化操作
+                String percentage = decimalFormat.format((result));
+
+                mapL.put("zs",num1.longValue());
+                mapL.put("lc",num);
+                mapL.put("bfb",percentage);
+            }
+
+            map.put(sysDictData.getDictValue(),mapL);
+
+        }
+        return AjaxResult.success(map);
+    }
+
+    @Override
+    public AjaxResult numAmount() {
+        Map<String,Object> map = new HashMap<>();
+        //当前年第一天
+        String startTime = DateUtils.getTime("5");
+        //当天
+        String endTime = DateUtils.getTime("1");
+        //查询当前时间内数据
+        DoumuProductInfo doumuProductInfo = new DoumuProductInfo();
+        doumuProductInfo.setBeginTime(startTime);
+        doumuProductInfo.setEndTime(endTime);
+        List<DoumuProductInfo> doumuProductInfoList = doumuProductInfoMapper.selectDoumuProductInfoList(doumuProductInfo);
+        List<String> listX = new ArrayList<>();
+        //发货数
+        List<String> listy1 = new ArrayList<>();
+        //取货数
+        List<String> listy2 = new ArrayList<>();
+        //金额
+        List<String> listy3 = new ArrayList<>();
+        //获取当前年份
+        String year = DateUtils.dateTimeNow("yyyy");
+        if(doumuProductInfoList==null || doumuProductInfoList.size()<=0){
+            for (int i = 1; i < 13; i++) {
+                StringBuilder sb = new StringBuilder();
+                sb.append(i).append("月");
+                listX.add(sb.toString());
+                listy1.add("0");
+                listy2.add("0");
+                listy3.add("0");
+            }
+            map.put("x",listX);
+            map.put("y1",listy1);
+            map.put("y2",listy2);
+            map.put("y3",listy3);
+            return AjaxResult.success(map);
+        }
+        for (int i = 1; i < 13; i++) {
+            StringBuilder sb = new StringBuilder();
+            sb.append(i).append("月");
+            listX.add(sb.toString());
+            //当前月份
+            String month = DateUtils.dateTimeNow("yyyy-MM");
+            //发货数
+            int y1 = 0;
+            //取货数
+            int y2 = 0;
+            //金额
+            Double y3 = 0D;
+            for (DoumuProductInfo productInfo : doumuProductInfoList) {
+                if(productInfo.getCreateTime().toString().contains(month)){
+                    //金额
+                    BigDecimal num1 = new BigDecimal(y3);
+                    BigDecimal num2 = new BigDecimal(productInfo.getTotalPrice());
+                    BigDecimal subNum1 = num1.add(num2);
+                    y3 = subNum1.doubleValue();
+                    //邮寄
+                    if("1".equals(productInfo.getDeliveryType())){
+                        y1 = y1 + Integer.parseInt(productInfo.getQuantity());
+
+                    }else {
+                        //自取
+                        y2 = y2 + Integer.parseInt(productInfo.getQuantity());
+                    }
+
+                }
+            }
+            listy1.add(String.valueOf(y1));
+            listy2.add(String.valueOf(y2));
+            listy3.add(String.valueOf(y3));
+
         }
+        map.put("x",listX);
+        map.put("y1",listy1);
+        map.put("y2",listy2);
+        map.put("y3",listy3);
         return AjaxResult.success(map);
     }
 }

ruoyi-system/src/main/resources/mapper/system/DoumuEvaluateMapper.xml

@@ -0,0 +1,105 @@
+<?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.ruoyi.system.mapper.DoumuEvaluateMapper">
+    
+    <resultMap type="DoumuEvaluate" id="DoumuEvaluateResult">
+        <result property="evaluateId"    column="evaluate_id"    />
+        <result property="productId"    column="product_id"    />
+        <result property="orderNumber"    column="order_number"    />
+        <result property="synthesisEvaluate"    column="synthesis_evaluate"    />
+        <result property="productEvaluate"    column="product_evaluate"    />
+        <result property="serviceEvaluate"    column="service_evaluate"    />
+        <result property="flowEvaluate"    column="flow_evaluate"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectDoumuEvaluateVo">
+        select evaluate_id, product_id, order_number, synthesis_evaluate, product_evaluate, service_evaluate, flow_evaluate, create_by, create_time, update_by, update_time, remark from doumu_evaluate
+    </sql>
+
+    <select id="selectDoumuEvaluateList" parameterType="DoumuEvaluate" resultMap="DoumuEvaluateResult">
+        <include refid="selectDoumuEvaluateVo"/>
+        <where>  
+            <if test="productId != null "> and product_id = #{productId}</if>
+            <if test="orderNumber != null  and orderNumber != ''"> and order_number = #{orderNumber}</if>
+            <if test="synthesisEvaluate != null  and synthesisEvaluate != ''"> and synthesis_evaluate = #{synthesisEvaluate}</if>
+            <if test="productEvaluate != null  and productEvaluate != ''"> and product_evaluate = #{productEvaluate}</if>
+            <if test="serviceEvaluate != null  and serviceEvaluate != ''"> and service_evaluate = #{serviceEvaluate}</if>
+            <if test="flowEvaluate != null  and flowEvaluate != ''"> and flow_evaluate = #{flowEvaluate}</if>
+        </where>
+    </select>
+    
+    <select id="selectDoumuEvaluateByEvaluateId" parameterType="Long" resultMap="DoumuEvaluateResult">
+        <include refid="selectDoumuEvaluateVo"/>
+        where evaluate_id = #{evaluateId}
+    </select>
+    <select id="selectDoumuEvaluateByProductId" resultType="com.ruoyi.system.domain.DoumuEvaluate">
+        <include refid="selectDoumuEvaluateVo"/>
+        where product_id = #{productId}
+    </select>
+
+    <insert id="insertDoumuEvaluate" parameterType="DoumuEvaluate" useGeneratedKeys="true" keyProperty="evaluateId">
+        insert into doumu_evaluate
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="productId != null">product_id,</if>
+            <if test="orderNumber != null">order_number,</if>
+            <if test="synthesisEvaluate != null">synthesis_evaluate,</if>
+            <if test="productEvaluate != null">product_evaluate,</if>
+            <if test="serviceEvaluate != null">service_evaluate,</if>
+            <if test="flowEvaluate != null">flow_evaluate,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="productId != null">#{productId},</if>
+            <if test="orderNumber != null">#{orderNumber},</if>
+            <if test="synthesisEvaluate != null">#{synthesisEvaluate},</if>
+            <if test="productEvaluate != null">#{productEvaluate},</if>
+            <if test="serviceEvaluate != null">#{serviceEvaluate},</if>
+            <if test="flowEvaluate != null">#{flowEvaluate},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateDoumuEvaluate" parameterType="DoumuEvaluate">
+        update doumu_evaluate
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="productId != null">product_id = #{productId},</if>
+            <if test="orderNumber != null">order_number = #{orderNumber},</if>
+            <if test="synthesisEvaluate != null">synthesis_evaluate = #{synthesisEvaluate},</if>
+            <if test="productEvaluate != null">product_evaluate = #{productEvaluate},</if>
+            <if test="serviceEvaluate != null">service_evaluate = #{serviceEvaluate},</if>
+            <if test="flowEvaluate != null">flow_evaluate = #{flowEvaluate},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where evaluate_id = #{evaluateId}
+    </update>
+
+    <delete id="deleteDoumuEvaluateByEvaluateId" parameterType="Long">
+        delete from doumu_evaluate where evaluate_id = #{evaluateId}
+    </delete>
+
+    <delete id="deleteDoumuEvaluateByEvaluateIds" parameterType="String">
+        delete from doumu_evaluate where evaluate_id in 
+        <foreach item="evaluateId" collection="array" open="(" separator="," close=")">
+            #{evaluateId}
+        </foreach>
+    </delete>
+</mapper>

ruoyi-system/src/main/resources/mapper/system/DoumuProductFjMapper.xml

@@ -9,11 +9,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="productId"    column="product_id"    />
         <result property="fjName"    column="fj_name"    />
         <result property="path"    column="path"    />
+        <result property="type"    column="type"    />
+        <result property="module"    column="module"    />
         <result property="remark"    column="remark"    />
     </resultMap>
 
     <sql id="selectDoumuProductFjVo">
-        select fi_id, product_id, fj_name, path, remark from doumu_product_fj
+        select fi_id, product_id, fj_name, path,type,module, remark from doumu_product_fj
     </sql>
 
     <select id="selectDoumuProductFjList" parameterType="DoumuProductFj" resultMap="DoumuProductFjResult">
@@ -22,6 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="productId != null "> and product_id = #{productId}</if>
             <if test="fjName != null  and fjName != ''"> and fj_name like concat('%', #{fjName}, '%')</if>
             <if test="path != null  and path != ''"> and path = #{path}</if>
+            <if test="module != null  and module != ''"> and module = #{module}</if>
         </where>
     </select>
     
@@ -31,38 +34,44 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
         
     <insert id="insertDoumuProductFj" parameterType="DoumuProductFj" useGeneratedKeys="true" keyProperty="fiId">
-        insert into doumu_product_fi
+        insert into doumu_product_fj
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="productId != null">product_id,</if>
             <if test="fjName != null and fjName != ''">fj_name,</if>
             <if test="path != null">path,</if>
+            <if test="type != null">type,</if>
+            <if test="module != null">module,</if>
             <if test="remark != null">remark,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="productId != null">#{productId},</if>
             <if test="fjName != null and fjName != ''">#{fjName},</if>
             <if test="path != null">#{path},</if>
+            <if test="type != null">#{type},</if>
+            <if test="module != null">#{module},</if>
             <if test="remark != null">#{remark},</if>
          </trim>
     </insert>
 
     <update id="updateDoumuProductFj" parameterType="DoumuProductFj">
-        update doumu_product_fi
+        update doumu_product_fj
         <trim prefix="SET" suffixOverrides=",">
             <if test="productId != null">product_id = #{productId},</if>
             <if test="fjName != null and fjName != ''">fj_name = #{fjName},</if>
             <if test="path != null">path = #{path},</if>
+            <if test="type != null">type = #{type},</if>
+            <if test="module != null">module = #{module},</if>
             <if test="remark != null">remark = #{remark},</if>
         </trim>
         where fi_id = #{fiId}
     </update>
 
     <delete id="deleteDoumuProductFjByFiId" parameterType="Long">
-        delete from doumu_product_fi where fi_id = #{fiId}
+        delete from doumu_product_fj where fi_id = #{fiId}
     </delete>
 
     <delete id="deleteDoumuProductFjByFiIds" parameterType="String">
-        delete from doumu_product_fi where fi_id in 
+        delete from doumu_product_fj where fi_id in
         <foreach item="fiId" collection="array" open="(" separator="," close=")">
             #{fiId}
         </foreach>

ruoyi-system/src/main/resources/mapper/system/DoumuProductHistoryMapper.xml

@@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="DoumuProductHistory" id="DoumuProductHistoryResult">
         <result property="historyId"    column="history_id"    />
         <result property="productId"    column="product_id"    />
+        <result property="openid"    column="openid"    />
         <result property="orderNumber"    column="order_number"    />
         <result property="name"    column="name"    />
         <result property="deliveryType"    column="delivery_type"    />
@@ -23,16 +24,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="lat"    column="lat"    />
         <result property="flowType"    column="flow_type"    />
         <result property="status"    column="status"    />
+        <result property="goodsName"    column="goods_name"    />
+        <result property="totalPrice"    column="total_price"    />
         <result property="mailNo"    column="mail_no"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
         <result property="remark"    column="remark"    />
+
+        <result property="beginTime"    column="beginTime"    />
+        <result property="endTime"    column="endTime"    />
     </resultMap>
 
     <sql id="selectDoumuProductHistoryVo">
-        select history_id,order_number, product_id, name, delivery_type, phonenumber,quantity,province_id,province,city_id,city,county_id,county,lon,lat,status, address, flow_type, mail_no, create_by, create_time, update_by, update_time, remark from doumu_product_history
+        select history_id,order_number,openid, product_id, name, delivery_type, phonenumber,quantity,province_id,province,city_id,city,county_id,county,lon,lat,
+               status, address, flow_type,,goods_name,total_price, mail_no, create_by, create_time, update_by, update_time, remark from doumu_product_history
     </sql>
 
     <select id="selectDoumuProductHistoryList" parameterType="DoumuProductHistory" resultMap="DoumuProductHistoryResult">
@@ -66,6 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         insert into doumu_product_history
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="productId != null">product_id,</if>
+            <if test="openid != null "> openid,</if>
             <if test="orderNumber != null "> order_number,</if>
             <if test="name != null and name != ''">name,</if>
             <if test="deliveryType != null">delivery_type,</if>
@@ -82,6 +90,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="lat != null">lat,</if>
             <if test="flowType != null">flow_type,</if>
             <if test="status != null">status,</if>
+            <if test="goodsName != null">goods_name,</if>
+            <if test="totalPrice != null and totalPrice != 0">total_price,</if>
             <if test="mailNo != null">mailNo,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
@@ -91,6 +101,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="productId != null">#{productId},</if>
+            <if test="openid != null "> #{openid},</if>
             <if test="orderNumber != null ">#{orderNumber},</if>
             <if test="name != null and name != ''">#{name},</if>
             <if test="deliveryType != null">#{deliveryType},</if>
@@ -106,6 +117,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="lat != null">#{lat},</if>
             <if test="flowType != null">#{flowType},</if>
             <if test="status != null">#{status},</if>
+            <if test="goodsName != null">#{goodsName},</if>
+            <if test="totalPrice != null and totalPrice != 0">#{totalPrice},</if>
             <if test="mailNo != null">#{mailNo},</if>
             <if test="flowType != null">#{flowType},</if>
             <if test="createBy != null">#{createBy},</if>
@@ -120,6 +133,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update doumu_product_history
         <trim prefix="SET" suffixOverrides=",">
             <if test="productId != null">product_id = #{productId},</if>
+            <if test="openid != null "> openid = #{openid},</if>
             <if test="orderNumber != null  and orderNumber != ''"> order_number = #{orderNumber},</if>
             <if test="name != null and name != ''">name = #{name},</if>
             <if test="deliveryType != null">delivery_type = #{deliveryType},</if>
@@ -135,6 +149,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="lat != null">lat = #{lat},</if>
             <if test="flowType != null">flow_type = #{flowType},</if>
             <if test="status != null">status = #{status},</if>
+            <if test="goodsName != null">goods_name = #{goodsName},</if>
+            <if test="totalPrice != null and totalPrice != 0">total_price = #{totalPrice},</if>
             <if test="mailNo != null">mailNo = #{mailNo},</if>
             <if test="flowType != null">flow_type = #{flowType},</if>
             <if test="createBy != null">create_by = #{createBy},</if>

ruoyi-system/src/main/resources/mapper/system/DoumuProductInfoMapper.xml

@@ -5,6 +5,7 @@
 <mapper namespace="com.ruoyi.system.mapper.DoumuProductInfoMapper">
 
     <resultMap type="DoumuProductInfo" id="DoumuProductInfoResult">
+        <result property="productId"    column="product_id"    />
         <result property="productId"    column="product_id"    />
         <result property="openid"    column="openid"    />
         <result property="orderNumber"    column="order_number"    />
@@ -158,7 +159,7 @@
     </update>
 
     <update id="updateDoumuProductInfoFlowList">
-        update doumu_product_info flow_type = #{flowType} where product_id in
+        update doumu_product_info set flow_type = #{flowType} where product_id in
         <foreach collection="productIdList" index="index" item="productId" open="(" separator="," close=")">
             #{productId}
         </foreach>