1.对比每天支付单跟中网订单有差异的订单数

kmall-admin/src/main/java/com/kmall/admin/controller/compared/OrderComparedErrorController.java

@@ -0,0 +1,124 @@
+package com.kmall.admin.controller.compared;
+
+import java.util.List;
+import java.util.Map;
+
+import com.kmall.admin.entity.compared.OrderComparedErrorEntity;
+import com.kmall.admin.service.compared.OrderComparedErrorService;
+import com.kmall.common.utils.PageUtils;
+import com.kmall.common.utils.Query;
+import com.kmall.common.utils.R;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+
+/**
+ * Controller
+ *
+ * @author emato
+ * @email admin@qhdswl.com
+ * @date 2020-11-26 10:16:58
+ */
+@Controller
+@RequestMapping("ordercomparederror")
+public class OrderComparedErrorController {
+    @Autowired
+    private OrderComparedErrorService orderComparedErrorService;
+
+    /**
+     * 查看列表
+     */
+    @RequestMapping("/list")
+//    @RequiresPermissions("ordercomparederror:list")
+    @ResponseBody
+    public R list(@RequestParam Map<String, Object> params) {
+        //查询列表数据
+        Query query = new Query(params);
+
+        List<OrderComparedErrorEntity> orderComparedErrorList = orderComparedErrorService.queryList(query);
+        int total = orderComparedErrorService.queryTotal(query);
+
+        PageUtils pageUtil = new PageUtils(orderComparedErrorList, total, query.getLimit(), query.getPage());
+
+        return R.ok().put("page", pageUtil);
+    }
+
+    /**
+     * 查看信息
+     */
+    @RequestMapping("/info/{moceId}")
+//    @RequiresPermissions("ordercomparederror:info")
+    @ResponseBody
+    public R info(@PathVariable("moceId") Integer moceId) {
+        OrderComparedErrorEntity orderComparedError = orderComparedErrorService.queryObject(moceId);
+
+        return R.ok().put("orderComparedError", orderComparedError);
+    }
+
+    /**
+     * 保存
+     */
+    @RequestMapping("/save")
+//    @RequiresPermissions("ordercomparederror:save")
+    @ResponseBody
+    public R save(@RequestBody OrderComparedErrorEntity orderComparedError) {
+        orderComparedErrorService.save(orderComparedError);
+
+        return R.ok();
+    }
+
+    /**
+     * 修改
+     */
+    @RequestMapping("/update")
+//    @RequiresPermissions("ordercomparederror:update")
+    @ResponseBody
+    public R update(@RequestBody OrderComparedErrorEntity orderComparedError) {
+        orderComparedErrorService.update(orderComparedError);
+
+        return R.ok();
+    }
+
+    /**
+     * 删除
+     */
+    @RequestMapping("/delete")
+//    @RequiresPermissions("ordercomparederror:delete")
+    @ResponseBody
+    public R delete(@RequestBody Integer[]moceIds) {
+        orderComparedErrorService.deleteBatch(moceIds);
+
+        return R.ok();
+    }
+
+    /**
+     * 查看所有列表
+     */
+    @RequestMapping("/queryAll")
+    @ResponseBody
+    public R queryAll(@RequestParam Map<String, Object> params) {
+
+        List<OrderComparedErrorEntity> list = orderComparedErrorService.queryList(params);
+
+        return R.ok().put("list", list);
+    }
+
+
+    @RequestMapping("/comparedOrder")
+    @ResponseBody
+    public R comparedOrder() {
+
+        try {
+            String returnMsg = orderComparedErrorService.comparedOrder();
+            return R.ok().put("msg",returnMsg);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return R.error(e.getMessage());
+        }
+
+    }
+
+
+}

kmall-admin/src/main/java/com/kmall/admin/controller/compared/PayOrderInfoController.java

@@ -0,0 +1,160 @@
+package com.kmall.admin.controller.compared;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.kmall.admin.dto.GoodsDto;
+import com.kmall.admin.dto.PayOrderDto;
+import com.kmall.admin.entity.compared.PayOrderInfoEntity;
+import com.kmall.admin.service.compared.PayOrderInfoService;
+import com.kmall.common.constant.Dict;
+import com.kmall.common.constant.JxlsXmlTemplateName;
+import com.kmall.common.utils.PageUtils;
+import com.kmall.common.utils.Query;
+import com.kmall.common.utils.R;
+import com.kmall.common.utils.excel.ExcelUtil;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+
+/**
+ * Controller
+ *
+ * @author emato
+ * @email admin@qhdswl.com
+ * @date 2020-11-26 10:16:58
+ */
+@Controller
+@RequestMapping("payorderinfo")
+public class PayOrderInfoController {
+    @Autowired
+    private PayOrderInfoService payOrderInfoService;
+    @Autowired
+    private ExcelUtil excelUtil;
+    /**
+     * 查看列表
+     */
+    @RequestMapping("/list")
+//    @RequiresPermissions("payorderinfo:list")
+    @ResponseBody
+    public R list(@RequestParam Map<String, Object> params) {
+        //查询列表数据
+        Query query = new Query(params);
+
+        List<PayOrderInfoEntity> payOrderInfoList = payOrderInfoService.queryList(query);
+        int total = payOrderInfoService.queryTotal(query);
+
+        PageUtils pageUtil = new PageUtils(payOrderInfoList, total, query.getLimit(), query.getPage());
+
+        return R.ok().put("page", pageUtil);
+    }
+
+    /**
+     * 查看信息
+     */
+    @RequestMapping("/info/{mpoiId}")
+//    @RequiresPermissions("payorderinfo:info")
+    @ResponseBody
+    public R info(@PathVariable("mpoiId") Integer mpoiId) {
+        PayOrderInfoEntity payOrderInfo = payOrderInfoService.queryObject(mpoiId);
+
+        return R.ok().put("payOrderInfo", payOrderInfo);
+    }
+
+    /**
+     * 保存
+     */
+    @RequestMapping("/save")
+//    @RequiresPermissions("payorderinfo:save")
+    @ResponseBody
+    public R save(@RequestBody PayOrderInfoEntity payOrderInfo) {
+        payOrderInfoService.save(payOrderInfo);
+
+        return R.ok();
+    }
+
+    /**
+     * 修改
+     */
+    @RequestMapping("/update")
+//    @RequiresPermissions("payorderinfo:update")
+    @ResponseBody
+    public R update(@RequestBody PayOrderInfoEntity payOrderInfo) {
+        payOrderInfoService.update(payOrderInfo);
+
+        return R.ok();
+    }
+
+    /**
+     * 删除
+     */
+    @RequestMapping("/delete")
+//    @RequiresPermissions("payorderinfo:delete")
+    @ResponseBody
+    public R delete(@RequestBody Integer[]mpoiIds) {
+        payOrderInfoService.deleteBatch(mpoiIds);
+
+        return R.ok();
+    }
+
+    /**
+     * 查看所有列表
+     */
+    @RequestMapping("/queryAll")
+    @ResponseBody
+    public R queryAll(@RequestParam Map<String, Object> params) {
+
+        List<PayOrderInfoEntity> list = payOrderInfoService.queryList(params);
+
+        return R.ok().put("list", list);
+    }
+
+    /**
+     * 上传文件
+     */
+    @RequestMapping("/uploadAlipayOrder")
+    @ResponseBody
+    public R uploadAlipayOrder(@RequestParam("file") MultipartFile file) {
+        List<PayOrderDto> payOrderDtoList = new ArrayList<>();// 支付订单信息
+        try {
+            Map<String, Object> beans = new HashMap<String, Object>();
+            beans.put("PayOrderDtoList", payOrderDtoList);
+            if (file.isEmpty()) {
+                return R.error("文件不能为空！");
+            }
+            excelUtil.readExcel(JxlsXmlTemplateName.ALIPAY_PAY_ORDER_DTO_LIST, beans, file.getInputStream());
+        } catch (Exception e) {
+            e.printStackTrace();
+            return R.error("导入失败！");
+        }
+        payOrderInfoService.uploadExcel(payOrderDtoList,Dict.payFlag.item_alipay.getItem());
+        //上传文件
+        return R.ok();
+    }
+
+    @RequestMapping("/uploadWXOrder")
+    @ResponseBody
+    public R uploadWXOrder(@RequestParam("file") MultipartFile file) {
+        List<PayOrderDto> payOrderDtoList = new ArrayList<>();// 支付订单信息
+        try {
+            Map<String, Object> beans = new HashMap<String, Object>();
+            beans.put("PayOrderDtoList", payOrderDtoList);
+            if (file.isEmpty()) {
+                return R.error("文件不能为空！");
+            }
+            excelUtil.readExcel(JxlsXmlTemplateName.WX_PAY_ORDER_DTO_LIST, beans, file.getInputStream());
+        } catch (Exception e) {
+            e.printStackTrace();
+            return R.error("导入失败！");
+        }
+        payOrderInfoService.uploadExcel(payOrderDtoList,Dict.payFlag.item_weixin.getItem());
+        //上传文件
+        return R.ok();
+    }
+
+}

kmall-admin/src/main/java/com/kmall/admin/dao/compared/OrderComparedErrorDao.java

@@ -0,0 +1,16 @@
+package com.kmall.admin.dao.compared;
+
+
+import com.kmall.admin.entity.compared.OrderComparedErrorEntity;
+import com.kmall.manager.dao.BaseDao;
+
+/**
+ * Dao
+ *
+ * @author emato
+ * @email admin@qhdswl.com
+ * @date 2020-11-26 10:16:58
+ */
+public interface OrderComparedErrorDao extends BaseDao<OrderComparedErrorEntity> {
+
+}

kmall-admin/src/main/java/com/kmall/admin/dao/compared/PayOrderInfoDao.java

@@ -0,0 +1,25 @@
+package com.kmall.admin.dao.compared;
+
+
+import com.kmall.admin.entity.compared.PayOrderInfoEntity;
+import com.kmall.manager.dao.BaseDao;
+
+import java.util.List;
+
+/**
+ * Dao
+ *
+ * @author emato
+ * @email admin@qhdswl.com
+ * @date 2020-11-26 10:16:58
+ */
+public interface PayOrderInfoDao extends BaseDao<PayOrderInfoEntity> {
+
+    /**
+     *
+     * @return
+     */
+    List<PayOrderInfoEntity> queryNoComparedOrder();
+
+    void updateBatch(List<PayOrderInfoEntity> payOrderInfoEntities);
+}

kmall-admin/src/main/java/com/kmall/admin/dto/PayOrderDto.java

@@ -0,0 +1,213 @@
+package com.kmall.admin.dto;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 实体
+ * 表名 mall_pay_order_info
+ *
+ * @author emato
+ * @email admin@qhdswl.com
+ * @date 2020-11-26 10:16:58
+ */
+public class PayOrderDto implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     *
+     */
+    private Integer mpoiId;
+    /**
+     *
+     */
+    private String merchOrderSn;
+    /**
+     *
+     */
+    private String payStatus;
+    /**
+     *
+     */
+    private String orderAmount;
+    /**
+     *
+     */
+    private String refundAmount;
+    /**
+     *
+     */
+    private String orderStatus;
+    /**
+     *
+     */
+    private String payFlag;
+    /**
+     *
+     */
+    private String payTime;
+    /**
+     *
+     */
+    private String importTime;
+    /**
+     *
+     */
+    private String importer;
+    /**
+     *
+     */
+    private String compared;
+    /**
+     *
+     */
+    private String comparedTime;
+
+    /**
+     * 设置：
+     */
+    public void setMpoiId(Integer mpoiId) {
+        this.mpoiId = mpoiId;
+    }
+
+    /**
+     * 获取：
+     */
+    public Integer getMpoiId() {
+        return mpoiId;
+    }
+    /**
+     * 设置：
+     */
+    public void setMerchOrderSn(String merchOrderSn) {
+        this.merchOrderSn = merchOrderSn;
+    }
+
+    /**
+     * 获取：
+     */
+    public String getMerchOrderSn() {
+        return merchOrderSn;
+    }
+    /**
+     * 设置：
+     */
+    public void setPayStatus(String payStatus) {
+        this.payStatus = payStatus;
+    }
+
+    /**
+     * 获取：
+     */
+    public String getPayStatus() {
+        return payStatus;
+    }
+
+    public String getOrderAmount() {
+        return orderAmount;
+    }
+
+    public void setOrderAmount(String orderAmount) {
+        this.orderAmount = orderAmount;
+    }
+
+    public String getRefundAmount() {
+        return refundAmount;
+    }
+
+    public void setRefundAmount(String refundAmount) {
+        this.refundAmount = refundAmount;
+    }
+
+    /**
+     * 设置：
+     */
+    public void setOrderStatus(String orderStatus) {
+        this.orderStatus = orderStatus;
+    }
+
+    /**
+     * 获取：
+     */
+    public String getOrderStatus() {
+        return orderStatus;
+    }
+    /**
+     * 设置：
+     */
+    public void setPayFlag(String payFlag) {
+        this.payFlag = payFlag;
+    }
+
+    /**
+     * 获取：
+     */
+    public String getPayFlag() {
+        return payFlag;
+    }
+    /**
+     * 设置：
+     */
+    public void setPayTime(String payTime) {
+        this.payTime = payTime;
+    }
+
+    /**
+     * 获取：
+     */
+    public String getPayTime() {
+        return payTime;
+    }
+    /**
+     * 设置：
+     */
+    public void setImportTime(String importTime) {
+        this.importTime = importTime;
+    }
+
+    /**
+     * 获取：
+     */
+    public String getImportTime() {
+        return importTime;
+    }
+    /**
+     * 设置：
+     */
+    public void setImporter(String importer) {
+        this.importer = importer;
+    }
+
+    /**
+     * 获取：
+     */
+    public String getImporter() {
+        return importer;
+    }
+    /**
+     * 设置：
+     */
+    public void setCompared(String compared) {
+        this.compared = compared;
+    }
+
+    /**
+     * 获取：
+     */
+    public String getCompared() {
+        return compared;
+    }
+    /**
+     * 设置：
+     */
+    public void setComparedTime(String comparedTime) {
+        this.comparedTime = comparedTime;
+    }
+
+    /**
+     * 获取：
+     */
+    public String getComparedTime() {
+        return comparedTime;
+    }
+}

kmall-admin/src/main/java/com/kmall/admin/entity/compared/OrderComparedErrorEntity.java

@@ -0,0 +1,104 @@
+package com.kmall.admin.entity.compared;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 实体
+ * 表名 mall_order_compared_error
+ *
+ * @author emato
+ * @email admin@qhdswl.com
+ * @date 2020-11-26 10:16:58
+ */
+public class OrderComparedErrorEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     *
+     */
+    private Integer moceId;
+    /**
+     *
+     */
+    private String merchOrderSn;
+    /**
+     *
+     */
+    private BigDecimal orderAmount;
+    /**
+     *
+     */
+    private String orderSource;
+    /**
+     *
+     */
+    private String createTime;
+
+    /**
+     * 设置：
+     */
+    public void setMoceId(Integer moceId) {
+        this.moceId = moceId;
+    }
+
+    /**
+     * 获取：
+     */
+    public Integer getMoceId() {
+        return moceId;
+    }
+    /**
+     * 设置：
+     */
+    public void setMerchOrderSn(String merchOrderSn) {
+        this.merchOrderSn = merchOrderSn;
+    }
+
+    /**
+     * 获取：
+     */
+    public String getMerchOrderSn() {
+        return merchOrderSn;
+    }
+    /**
+     * 设置：
+     */
+    public void setOrderAmount(BigDecimal orderAmount) {
+        this.orderAmount = orderAmount;
+    }
+
+    /**
+     * 获取：
+     */
+    public BigDecimal getOrderAmount() {
+        return orderAmount;
+    }
+    /**
+     * 设置：
+     */
+    public void setOrderSource(String orderSource) {
+        this.orderSource = orderSource;
+    }
+
+    /**
+     * 获取：
+     */
+    public String getOrderSource() {
+        return orderSource;
+    }
+    /**
+     * 设置：
+     */
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * 获取：
+     */
+    public String getCreateTime() {
+        return createTime;
+    }
+}

kmall-admin/src/main/java/com/kmall/admin/entity/compared/PayOrderInfoEntity.java

@@ -0,0 +1,223 @@
+package com.kmall.admin.entity.compared;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 实体
+ * 表名 mall_pay_order_info
+ *
+ * @author emato
+ * @email admin@qhdswl.com
+ * @date 2020-11-26 10:16:58
+ */
+public class PayOrderInfoEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     *
+     */
+    private Integer mpoiId;
+    /**
+     *
+     */
+    private String merchOrderSn;
+    /**
+     *
+     */
+    private String payStatus;
+    /**
+     *
+     */
+    private BigDecimal orderAmount;
+    /**
+     *
+     */
+    private BigDecimal refundAmount;
+    /**
+     *
+     */
+    private String orderStatus;
+    /**
+     *
+     */
+    private String payFlag;
+    /**
+     *
+     */
+    private String payTime;
+    /**
+     *
+     */
+    private String importTime;
+    /**
+     *
+     */
+    private String importer;
+    /**
+     *
+     */
+    private String compared;
+    /**
+     *
+     */
+    private String comparedTime;
+
+    /**
+     * 设置：
+     */
+    public void setMpoiId(Integer mpoiId) {
+        this.mpoiId = mpoiId;
+    }
+
+    /**
+     * 获取：
+     */
+    public Integer getMpoiId() {
+        return mpoiId;
+    }
+    /**
+     * 设置：
+     */
+    public void setMerchOrderSn(String merchOrderSn) {
+        this.merchOrderSn = merchOrderSn;
+    }
+
+    /**
+     * 获取：
+     */
+    public String getMerchOrderSn() {
+        return merchOrderSn;
+    }
+    /**
+     * 设置：
+     */
+    public void setPayStatus(String payStatus) {
+        this.payStatus = payStatus;
+    }
+
+    /**
+     * 获取：
+     */
+    public String getPayStatus() {
+        return payStatus;
+    }
+    /**
+     * 设置：
+     */
+    public void setOrderAmount(BigDecimal orderAmount) {
+        this.orderAmount = orderAmount;
+    }
+
+    /**
+     * 获取：
+     */
+    public BigDecimal getOrderAmount() {
+        return orderAmount;
+    }
+    /**
+     * 设置：
+     */
+    public void setRefundAmount(BigDecimal refundAmount) {
+        this.refundAmount = refundAmount;
+    }
+
+    /**
+     * 获取：
+     */
+    public BigDecimal getRefundAmount() {
+        return refundAmount;
+    }
+    /**
+     * 设置：
+     */
+    public void setOrderStatus(String orderStatus) {
+        this.orderStatus = orderStatus;
+    }
+
+    /**
+     * 获取：
+     */
+    public String getOrderStatus() {
+        return orderStatus;
+    }
+    /**
+     * 设置：
+     */
+    public void setPayFlag(String payFlag) {
+        this.payFlag = payFlag;
+    }
+
+    /**
+     * 获取：
+     */
+    public String getPayFlag() {
+        return payFlag;
+    }
+    /**
+     * 设置：
+     */
+    public void setPayTime(String payTime) {
+        this.payTime = payTime;
+    }
+
+    /**
+     * 获取：
+     */
+    public String getPayTime() {
+        return payTime;
+    }
+    /**
+     * 设置：
+     */
+    public void setImportTime(String importTime) {
+        this.importTime = importTime;
+    }
+
+    /**
+     * 获取：
+     */
+    public String getImportTime() {
+        return importTime;
+    }
+    /**
+     * 设置：
+     */
+    public void setImporter(String importer) {
+        this.importer = importer;
+    }
+
+    /**
+     * 获取：
+     */
+    public String getImporter() {
+        return importer;
+    }
+    /**
+     * 设置：
+     */
+    public void setCompared(String compared) {
+        this.compared = compared;
+    }
+
+    /**
+     * 获取：
+     */
+    public String getCompared() {
+        return compared;
+    }
+    /**
+     * 设置：
+     */
+    public void setComparedTime(String comparedTime) {
+        this.comparedTime = comparedTime;
+    }
+
+    /**
+     * 获取：
+     */
+    public String getComparedTime() {
+        return comparedTime;
+    }
+}

kmall-admin/src/main/java/com/kmall/admin/service/OrderService.java

@@ -188,4 +188,6 @@ public interface OrderService {
      * @return
      */
     List<SystemFormatDto> queryExportSystemFormatList(Map<String, Object> params);
+
+    List<OrderEntity> queryLastDayOrder();
 }

kmall-admin/src/main/java/com/kmall/admin/service/compared/OrderComparedErrorService.java

@@ -0,0 +1,78 @@
+package com.kmall.admin.service.compared;
+
+
+import com.kmall.admin.entity.compared.OrderComparedErrorEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Service接口
+ *
+ * @author emato
+ * @email admin@qhdswl.com
+ * @date 2020-11-26 10:16:58
+ */
+public interface OrderComparedErrorService {
+
+    /**
+     * 根据主键查询实体
+     *
+     * @param moceId 主键
+     * @return 实体
+     */
+    OrderComparedErrorEntity queryObject(Integer moceId);
+
+    /**
+     * 分页查询
+     *
+     * @param map 参数
+     * @return list
+     */
+    List<OrderComparedErrorEntity> queryList(Map<String, Object> map);
+
+    /**
+     * 分页统计总数
+     *
+     * @param map 参数
+     * @return 总数
+     */
+    int queryTotal(Map<String, Object> map);
+
+    /**
+     * 保存实体
+     *
+     * @param orderComparedError 实体
+     * @return 保存条数
+     */
+    int save(OrderComparedErrorEntity orderComparedError);
+
+    /**
+     * 根据主键更新实体
+     *
+     * @param orderComparedError 实体
+     * @return 更新条数
+     */
+    int update(OrderComparedErrorEntity orderComparedError);
+
+    /**
+     * 根据主键删除
+     *
+     * @param moceId
+     * @return 删除条数
+     */
+    int delete(Integer moceId);
+
+    /**
+     * 根据主键批量删除
+     *
+     * @param moceIds
+     * @return 删除条数
+     */
+    int deleteBatch(Integer[]moceIds);
+
+    /**
+     * 对比订单
+     */
+    String comparedOrder();
+}

kmall-admin/src/main/java/com/kmall/admin/service/compared/PayOrderInfoService.java

@@ -0,0 +1,87 @@
+package com.kmall.admin.service.compared;
+
+
+import com.kmall.admin.dto.PayOrderDto;
+import com.kmall.admin.entity.compared.PayOrderInfoEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Service接口
+ *
+ * @author emato
+ * @email admin@qhdswl.com
+ * @date 2020-11-26 10:16:58
+ */
+public interface PayOrderInfoService {
+
+    /**
+     * 根据主键查询实体
+     *
+     * @param mpoiId 主键
+     * @return 实体
+     */
+    PayOrderInfoEntity queryObject(Integer mpoiId);
+
+    /**
+     * 分页查询
+     *
+     * @param map 参数
+     * @return list
+     */
+    List<PayOrderInfoEntity> queryList(Map<String, Object> map);
+
+    /**
+     * 分页统计总数
+     *
+     * @param map 参数
+     * @return 总数
+     */
+    int queryTotal(Map<String, Object> map);
+
+    /**
+     * 保存实体
+     *
+     * @param payOrderInfo 实体
+     * @return 保存条数
+     */
+    int save(PayOrderInfoEntity payOrderInfo);
+
+    /**
+     * 根据主键更新实体
+     *
+     * @param payOrderInfo 实体
+     * @return 更新条数
+     */
+    int update(PayOrderInfoEntity payOrderInfo);
+
+    /**
+     * 根据主键删除
+     *
+     * @param mpoiId
+     * @return 删除条数
+     */
+    int delete(Integer mpoiId);
+
+    /**
+     * 根据主键批量删除
+     *
+     * @param mpoiIds
+     * @return 删除条数
+     */
+    int deleteBatch(Integer[]mpoiIds);
+
+    void uploadExcel(List<PayOrderDto> payOrderDtoList, String parseInt);
+
+    /**
+     * 查询所有未对比的订单
+     */
+    List<PayOrderInfoEntity> queryNoComparedOrder();
+
+    /**
+     * 批量修改数据
+     * @param payOrderInfoEntities
+     */
+    void updateBatch(List<PayOrderInfoEntity> payOrderInfoEntities);
+}

kmall-admin/src/main/java/com/kmall/admin/service/impl/OrderServiceImpl.java

@@ -68,8 +68,11 @@ import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.net.InetAddress;
 import java.net.URLDecoder;
+import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 
@@ -2730,6 +2733,38 @@ public class OrderServiceImpl implements OrderService {
         return systemFormatList;
     }
 
+    @Override
+    public List<OrderEntity> queryLastDayOrder() {
+
+        Map<String, Object> map = new HashMap<>();
+
+        DateFormat dateFmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");//格式化一下时间
+
+        Date dNow = new Date(); //当前时间
+
+        Date dBefore = new Date();
+
+        Calendar calendar = Calendar.getInstance(); //得到日历
+
+        calendar.setTime(dNow);//把当前时间赋给日历
+
+        calendar.add(Calendar.DAY_OF_MONTH, -1); //设置为前一天
+
+        dBefore = calendar.getTime(); //得到前一天的时间
+
+        String defaultStartDate = dateFmt.format(dBefore); //格式化前一天
+
+        defaultStartDate = defaultStartDate.substring(0,10)+" 00:00:00";
+
+
+        String defaultEndDate = defaultStartDate.substring(0,10)+" 23:59:59";
+
+
+        map.put("startTime",defaultStartDate);
+        map.put("endTime",defaultEndDate);
+        return orderDao.queryOffilineOrderList(map);
+    }
+
 
     /**
      * 设置订单数据

kmall-admin/src/main/java/com/kmall/admin/service/impl/PickUpCodeServiceImpl.java

@@ -53,7 +53,7 @@ public class PickUpCodeServiceImpl implements PickUpCodeService {
         if(pickUpCodeSn == null){
             pickUpCodeSn = "000001";
         }else{
-            AtomicInteger integer = new AtomicInteger(Integer.valueOf(pickUpCodeSn));
+            AtomicInteger integer = new AtomicInteger(Integer.valueOf(pickUpCodeSn.substring(pickUpCodeSn.indexOf("-")+1)));
             int i = integer.incrementAndGet();
             pickUpCodeSn= String.format("%06d", i);
         }

kmall-admin/src/main/java/com/kmall/admin/service/impl/compared/OrderComparedErrorServiceImpl.java

@@ -0,0 +1,154 @@
+package com.kmall.admin.service.impl.compared;
+
+import com.kmall.admin.dao.compared.OrderComparedErrorDao;
+import com.kmall.admin.entity.OrderEntity;
+import com.kmall.admin.entity.compared.OrderComparedErrorEntity;
+import com.kmall.admin.entity.compared.PayOrderInfoEntity;
+import com.kmall.admin.service.OrderService;
+import com.kmall.admin.service.compared.OrderComparedErrorService;
+import com.kmall.admin.service.compared.PayOrderInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.stream.Collectors;
+
+
+/**
+ * Service实现类
+ *
+ * @author emato
+ * @email admin@qhdswl.com
+ * @date 2020-11-26 10:16:58
+ */
+@Service("orderComparedErrorService")
+public class OrderComparedErrorServiceImpl implements OrderComparedErrorService {
+    @Autowired
+    private OrderComparedErrorDao orderComparedErrorDao;
+
+    @Autowired
+    private PayOrderInfoService payOrderInfoService;
+    @Autowired
+    private OrderService orderService;
+
+    @Override
+    public OrderComparedErrorEntity queryObject(Integer moceId) {
+        return orderComparedErrorDao.queryObject(moceId);
+    }
+
+    @Override
+    public List<OrderComparedErrorEntity> queryList(Map<String, Object> map) {
+        return orderComparedErrorDao.queryList(map);
+    }
+
+    @Override
+    public int queryTotal(Map<String, Object> map) {
+        return orderComparedErrorDao.queryTotal(map);
+    }
+
+    @Override
+    public int save(OrderComparedErrorEntity orderComparedError) {
+        return orderComparedErrorDao.save(orderComparedError);
+    }
+
+    @Override
+    public int update(OrderComparedErrorEntity orderComparedError) {
+        return orderComparedErrorDao.update(orderComparedError);
+    }
+
+    @Override
+    public int delete(Integer moceId) {
+        return orderComparedErrorDao.delete(moceId);
+    }
+
+    @Override
+    public int deleteBatch(Integer[]moceIds) {
+        return orderComparedErrorDao.deleteBatch(moceIds);
+    }
+
+    /**
+     * 对比订单
+     */
+    @Override
+    public String comparedOrder() {
+
+        try {
+            // 查询所有为对比的订单
+            List<PayOrderInfoEntity> payOrderInfoEntities = payOrderInfoService.queryNoComparedOrder();
+            if(payOrderInfoEntities == null || payOrderInfoEntities.size() == 0){
+                return "暂无需要对比的订单";
+            }
+
+            // 查询前一天的订单
+            List<OrderEntity> orderEntities = orderService.queryLastDayOrder();
+            // 异常订单集合
+            Set<String> errorOrderSn = new HashSet<>();
+            // 删除订单号集合
+            Set<String> removeOrderSn = new HashSet<>();
+
+            // 判断两边数量是否相等
+            if(payOrderInfoEntities.size() != orderEntities.size()){
+                Set<String> payOrderSnSet = payOrderInfoEntities.stream().map(PayOrderInfoEntity::getMerchOrderSn).collect(Collectors.toSet());
+                Set<String> orderSnSet = orderEntities.stream().map(OrderEntity::getOrderSn).collect(Collectors.toSet());
+                orderSnSet.removeAll(payOrderSnSet);
+                errorOrderSn.addAll(orderSnSet);
+            }
+
+
+            for(PayOrderInfoEntity parOrderInfo : payOrderInfoEntities){
+
+                String merchOrderSn = parOrderInfo.getMerchOrderSn();
+                // 先将该订单装入集合中
+                boolean add = errorOrderSn.add(merchOrderSn);
+                for(OrderEntity order : orderEntities){
+                    String orderSn = order.getOrderSn();
+                    if(orderSn.equals(merchOrderSn)){
+
+                        // 判断订单状态
+                        if(!order.getOrderStatus().equals(Integer.parseInt(parOrderInfo.getOrderStatus()))){
+                            continue;
+                        }
+                        // 判断支付状态
+                        if(!order.getPayStatus().equals(Integer.parseInt(parOrderInfo.getPayStatus()))){
+                            continue;
+                        }
+
+                        // 如果都一致，在集合中移除改订单
+                        errorOrderSn.remove(merchOrderSn);
+                        removeOrderSn.add(merchOrderSn);
+                    }
+                }
+
+                parOrderInfo.setCompared("1");
+                parOrderInfo.setComparedTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+
+            }
+
+            // 防止出现下了单当天退，支付宝会有两条数据，所以需要在删除一次
+            errorOrderSn.removeAll(removeOrderSn);
+
+            List<OrderComparedErrorEntity> insertList = new ArrayList<>();
+
+            Iterator<String> iterator = errorOrderSn.iterator();
+            while(iterator.hasNext()){
+                String orderSn = iterator.next();
+                // 将订单号插入到表中
+                OrderComparedErrorEntity orderComparedErrorEntity = new OrderComparedErrorEntity();
+                orderComparedErrorEntity.setMerchOrderSn(orderSn);
+
+                insertList.add(orderComparedErrorEntity);
+            }
+
+            // 插入异常订单记录
+            orderComparedErrorDao.saveBatch(insertList);
+            // 批量修改支付单对比状态跟对比时间
+            payOrderInfoService.updateBatch(payOrderInfoEntities);
+        } catch (NumberFormatException e) {
+            e.printStackTrace();
+            return "对比失败，原因："+e.getMessage();
+        }
+
+        return "对比成功";
+    }
+}

kmall-admin/src/main/java/com/kmall/admin/service/impl/compared/PayOrderInfoServiceImpl.java

@@ -0,0 +1,165 @@
+package com.kmall.admin.service.impl.compared;
+
+import com.google.common.collect.ImmutableBiMap;
+import com.kmall.admin.dao.compared.PayOrderInfoDao;
+import com.kmall.admin.dto.PayOrderDto;
+import com.kmall.admin.entity.compared.PayOrderInfoEntity;
+import com.kmall.admin.fromcomm.entity.SysUserEntity;
+import com.kmall.admin.service.compared.PayOrderInfoService;
+import com.kmall.admin.utils.ShiroUtils;
+import com.kmall.common.constant.Dict;
+import com.kmall.common.utils.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * Service实现类
+ *
+ * @author emato
+ * @email admin@qhdswl.com
+ * @date 2020-11-26 10:16:58
+ */
+@Service("payOrderInfoService")
+public class PayOrderInfoServiceImpl implements PayOrderInfoService {
+    @Autowired
+    private PayOrderInfoDao payOrderInfoDao;
+
+    @Override
+    public PayOrderInfoEntity queryObject(Integer mpoiId) {
+        return payOrderInfoDao.queryObject(mpoiId);
+    }
+
+    @Override
+    public List<PayOrderInfoEntity> queryList(Map<String, Object> map) {
+        return payOrderInfoDao.queryList(map);
+    }
+
+    @Override
+    public int queryTotal(Map<String, Object> map) {
+        return payOrderInfoDao.queryTotal(map);
+    }
+
+    @Override
+    public int save(PayOrderInfoEntity payOrderInfo) {
+        return payOrderInfoDao.save(payOrderInfo);
+    }
+
+    @Override
+    public int update(PayOrderInfoEntity payOrderInfo) {
+        return payOrderInfoDao.update(payOrderInfo);
+    }
+
+    @Override
+    public int delete(Integer mpoiId) {
+        return payOrderInfoDao.delete(mpoiId);
+    }
+
+    @Override
+    public int deleteBatch(Integer[]mpoiIds) {
+        return payOrderInfoDao.deleteBatch(mpoiIds);
+    }
+
+    @Override
+    public void uploadExcel(List<PayOrderDto> payOrderDtoList, String payFlag) {
+
+        List<PayOrderInfoEntity> insertList = new ArrayList<>();
+
+        if(payOrderDtoList != null && payOrderDtoList.size() > 0){
+
+            SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            SysUserEntity userEntity = ShiroUtils.getUserEntity();
+            for(PayOrderDto payOrderDto : payOrderDtoList){
+                Map<String, Object> valideDate = MapBeanUtil.fromObject(payOrderDto);
+                ImmutableBiMap.Builder builder = new ImmutableBiMap.Builder();
+                builder.put("merchOrderSn", "商户订单编号");
+
+                R r = ValidatorUtil.isEmpty(builder.build(), valideDate);
+                if (Integer.valueOf(r.get("code").toString()) != 0) {
+                    throw new RRException(r.get("msg").toString());
+                } else {
+
+                    if(Dict.payFlag.item_alipay.getItem().equals(payFlag)){
+                        String style = payOrderDto.getPayFlag();
+                        if( !style.equals("在线支付") && !style.equals("退款（交易退款）")){
+                            continue;
+                        }
+                    }
+
+                    PayOrderInfoEntity payOrderInfoEntity = new PayOrderInfoEntity();
+                    payOrderInfoEntity.setImporter(userEntity.getUserId()+""); // 导入者id
+                    payOrderInfoEntity.setImportTime(format.format(new Date())); // 导入时间
+                    if(Dict.payFlag.item_weixin.getItem().equals(payFlag)){
+                        if(StringUtils.isNotEmpty(payOrderDto.getOrderAmount()) && !"0".equals(payOrderDto.getOrderAmount())){
+                            payOrderInfoEntity.setOrderStatus("300"); // 订单状态
+                            payOrderInfoEntity.setOrderAmount(new BigDecimal(payOrderDto.getOrderAmount())); // 订单金额
+                        }else{
+                            payOrderInfoEntity.setOrderStatus("401"); // 订单状态
+                            payOrderInfoEntity.setOrderAmount(new BigDecimal(0)); // 订单金额
+                        }
+                        if(StringUtils.isNotEmpty(payOrderDto.getRefundAmount()) && !"0".equals(payOrderDto.getRefundAmount())){
+                            payOrderInfoEntity.setPayStatus("5"); // 支付状态
+                            payOrderInfoEntity.setRefundAmount(new BigDecimal(payOrderDto.getRefundAmount())); // 退款金额
+                        }else{
+                            payOrderInfoEntity.setPayStatus("2"); // 支付状态
+                            payOrderInfoEntity.setRefundAmount(new BigDecimal(0)); // 退款金额
+                        }
+                    }else if(Dict.payFlag.item_alipay.getItem().equals(payFlag)){
+                        if(StringUtils.isNotEmpty(payOrderDto.getOrderAmount()) ){
+                            payOrderInfoEntity.setOrderStatus("300"); // 订单状态
+                            payOrderInfoEntity.setOrderAmount(new BigDecimal(payOrderDto.getOrderAmount())); // 订单金额
+                        }else{
+                            payOrderInfoEntity.setOrderStatus("401"); // 订单状态
+                            payOrderInfoEntity.setOrderAmount(new BigDecimal(0)); // 订单金额
+                        }
+                        if(StringUtils.isNotEmpty(payOrderDto.getRefundAmount())){
+                            payOrderInfoEntity.setPayStatus("5"); // 支付状态
+                            payOrderInfoEntity.setRefundAmount(new BigDecimal(payOrderDto.getRefundAmount())); // 退款金额
+                        }else{
+                            payOrderInfoEntity.setPayStatus("2"); // 支付状态
+                            payOrderInfoEntity.setRefundAmount(new BigDecimal(0)); // 退款金额
+                        }
+                    }
+
+
+
+                    payOrderInfoEntity.setPayFlag(payFlag); // 支付方式
+                    payOrderInfoEntity.setPayTime(payOrderDto.getPayTime()); // 交易时间
+
+                    payOrderInfoEntity.setMerchOrderSn(payOrderDto.getMerchOrderSn()); // 订单号
+                    payOrderInfoEntity.setCompared("0"); // 是否对比过
+                    insertList.add(payOrderInfoEntity);
+                }
+            }
+        }
+
+        payOrderInfoDao.saveBatch(insertList);
+
+
+    }
+
+    /**
+     * 查询所有未对比的订单
+     */
+    @Override
+    public List<PayOrderInfoEntity> queryNoComparedOrder() {
+        return payOrderInfoDao.queryNoComparedOrder();
+    }
+
+    /**
+     * 批量修改数据
+     *
+     * @param payOrderInfoEntities
+     */
+    @Override
+    public void updateBatch(List<PayOrderInfoEntity> payOrderInfoEntities) {
+        payOrderInfoDao.updateBatch(payOrderInfoEntities);
+    }
+}

kmall-admin/src/main/resources/XmlTemplate/AlipayPayOrderDtoList.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<workbook>
+    <worksheet name="Sheet1">
+
+        <section startRow="0" endRow="2"/>
+        <loop startRow="3" endRow="3" items="PayOrderDtoList" var="PayOrderDto"
+              varType="com.kmall.admin.dto.PayOrderDto">
+            <section startRow="3" endRow="3">
+                <mapping row="3" col="1">PayOrderDto.payTime</mapping>
+                <mapping row="3" col="4">PayOrderDto.merchOrderSn</mapping>
+                <mapping row="3" col="5">PayOrderDto.payFlag</mapping>
+                <mapping row="3" col="6">PayOrderDto.orderAmount</mapping>
+                <mapping row="3" col="7">PayOrderDto.refundAmount</mapping>
+            </section>
+            <loopbreakcondition>
+                <rowcheck offset="0">
+                    <cellcheck offset="0"></cellcheck>
+                </rowcheck>
+            </loopbreakcondition>
+        </loop>
+    </worksheet>
+</workbook>

kmall-admin/src/main/resources/XmlTemplate/WXPayOrderDtoList.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<workbook>
+    <worksheet name="Sheet1">
+        <section startRow="0" endRow="0"/>
+        <loop startRow="1" endRow="1" items="PayOrderDtoList" var="PayOrderDto"
+              varType="com.kmall.admin.dto.PayOrderDto">
+            <section startRow="1" endRow="1">
+                <mapping row="1" col="0">PayOrderDto.payTime</mapping>
+                <mapping row="1" col="6">PayOrderDto.merchOrderSn</mapping>
+                <mapping row="1" col="24">PayOrderDto.orderAmount</mapping>
+                <mapping row="1" col="25">PayOrderDto.refundAmount</mapping>
+            </section>
+            <loopbreakcondition>
+                <rowcheck offset="0">
+                    <cellcheck offset="0"></cellcheck>
+                </rowcheck>
+            </loopbreakcondition>
+        </loop>
+    </worksheet>
+</workbook>

kmall-admin/src/main/resources/mybatis/mapper/compared/OrderComparedErrorDao.xml

@@ -0,0 +1,109 @@
+<?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.kmall.admin.dao.compared.OrderComparedErrorDao">
+
+    <resultMap type="com.kmall.admin.entity.compared.OrderComparedErrorEntity" id="orderComparedErrorMap">
+        <result property="moceId" column="moce_id"/>
+        <result property="merchOrderSn" column="merch_order_sn"/>
+        <result property="orderAmount" column="order_amount"/>
+        <result property="orderSource" column="order_source"/>
+        <result property="createTime" column="create_time"/>
+    </resultMap>
+
+	<select id="queryObject" resultType="com.kmall.admin.entity.compared.OrderComparedErrorEntity">
+		select
+			`moce_id`,
+			`merch_order_sn`,
+			`order_amount`,
+			`order_source`,
+			`create_time`
+		from mall_order_compared_error
+		where moce_id = #{id}
+	</select>
+
+	<select id="queryList" resultType="com.kmall.admin.entity.compared.OrderComparedErrorEntity">
+		select
+    		`moce_id`,
+    		`merch_order_sn`,
+    		`order_amount`,
+    		`order_source`,
+    		`create_time`
+		from mall_order_compared_error
+		WHERE 1=1
+		<if test="name != null and name.trim() != ''">
+			AND name LIKE concat('%',#{name},'%')
+		</if>
+        <choose>
+            <when test="sidx != null and sidx.trim() != ''">
+                order by ${sidx} ${order}
+            </when>
+			<otherwise>
+                order by moce_id desc
+			</otherwise>
+        </choose>
+		<if test="offset != null and limit != null">
+			limit #{offset}, #{limit}
+		</if>
+	</select>
+
+ 	<select id="queryTotal" resultType="int">
+		select count(*) from mall_order_compared_error
+		WHERE 1=1
+        <if test="name != null and name.trim() != ''">
+            AND name LIKE concat('%',#{name},'%')
+        </if>
+	</select>
+
+	<insert id="save" parameterType="com.kmall.admin.entity.compared.OrderComparedErrorEntity" useGeneratedKeys="true" keyProperty="moceId">
+		insert into mall_order_compared_error(
+			`merch_order_sn`,
+			`order_amount`,
+			`order_source`,
+			`create_time`)
+		values(
+			#{merchOrderSn},
+			#{orderAmount},
+			#{orderSource},
+			#{createTime})
+	</insert>
+
+	<update id="update" parameterType="com.kmall.admin.entity.compared.OrderComparedErrorEntity">
+		update mall_order_compared_error
+		<set>
+			<if test="merchOrderSn != null">`merch_order_sn` = #{merchOrderSn}, </if>
+			<if test="orderAmount != null">`order_amount` = #{orderAmount}, </if>
+			<if test="orderSource != null">`order_source` = #{orderSource}, </if>
+			<if test="createTime != null">`create_time` = #{createTime}</if>
+		</set>
+		where moce_id = #{moceId}
+	</update>
+
+	<delete id="delete">
+		delete from mall_order_compared_error where moce_id = #{value}
+	</delete>
+
+	<delete id="deleteBatch">
+		delete from mall_order_compared_error where moce_id in
+		<foreach item="moceId" collection="array" open="(" separator="," close=")">
+			#{moceId}
+		</foreach>
+	</delete>
+
+	<insert id="saveBatch" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id">
+		insert into mall_order_compared_error(
+			`merch_order_sn`,
+			`order_amount`,
+			`order_source`,
+			`create_time`)
+		values
+		<foreach collection="list" index="index" item="item" separator=",">
+		(
+			#{item.merchOrderSn},
+			#{item.orderAmount},
+			#{item.orderSource},
+			#{item.createTime})
+		</foreach>
+	</insert>
+
+</mapper>

kmall-admin/src/main/resources/mybatis/mapper/compared/PayOrderInfoDao.xml

@@ -0,0 +1,199 @@
+<?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.kmall.admin.dao.compared.PayOrderInfoDao">
+
+    <resultMap type="com.kmall.admin.entity.compared.PayOrderInfoEntity" id="payOrderInfoMap">
+        <result property="mpoiId" column="mpoi_id"/>
+        <result property="merchOrderSn" column="merch_order_sn"/>
+        <result property="payStatus" column="pay_status"/>
+        <result property="orderAmount" column="order_amount"/>
+        <result property="refundAmount" column="refund_amount"/>
+        <result property="orderStatus" column="order_status"/>
+        <result property="payFlag" column="pay_flag"/>
+        <result property="payTime" column="pay_time"/>
+        <result property="importTime" column="import_time"/>
+        <result property="importer" column="importer"/>
+        <result property="compared" column="compared"/>
+        <result property="comparedTime" column="compared_time"/>
+    </resultMap>
+
+	<select id="queryObject" resultType="com.kmall.admin.entity.compared.PayOrderInfoEntity">
+		select
+			`mpoi_id`,
+			`merch_order_sn`,
+			`pay_status`,
+			`order_amount`,
+			`refund_amount`,
+			`order_status`,
+			`pay_flag`,
+			`pay_time`,
+			`import_time`,
+			`importer`,
+			`compared`,
+			`compared_time`
+		from mall_pay_order_info
+		where mpoi_id = #{id}
+	</select>
+
+	<select id="queryList" resultType="com.kmall.admin.entity.compared.PayOrderInfoEntity">
+		select
+    		`mpoi_id`,
+    		`merch_order_sn`,
+    		`pay_status`,
+    		`order_amount`,
+    		`refund_amount`,
+    		`order_status`,
+    		`pay_flag`,
+    		`pay_time`,
+    		`import_time`,
+    		`importer`,
+    		`compared`,
+    		`compared_time`
+		from mall_pay_order_info
+		WHERE 1=1
+		<if test="name != null and name.trim() != ''">
+			AND name LIKE concat('%',#{name},'%')
+		</if>
+        <choose>
+            <when test="sidx != null and sidx.trim() != ''">
+                order by ${sidx} ${order}
+            </when>
+			<otherwise>
+                order by mpoi_id desc
+			</otherwise>
+        </choose>
+		<if test="offset != null and limit != null">
+			limit #{offset}, #{limit}
+		</if>
+	</select>
+
+ 	<select id="queryTotal" resultType="int">
+		select count(*) from mall_pay_order_info
+		WHERE 1=1
+        <if test="name != null and name.trim() != ''">
+            AND name LIKE concat('%',#{name},'%')
+        </if>
+	</select>
+
+	<insert id="save" parameterType="com.kmall.admin.entity.compared.PayOrderInfoEntity" useGeneratedKeys="true" keyProperty="mpoiId">
+		insert into mall_pay_order_info(
+			`merch_order_sn`,
+			`pay_status`,
+			`order_amount`,
+			`refund_amount`,
+			`order_status`,
+			`pay_flag`,
+			`pay_time`,
+			`import_time`,
+			`importer`,
+			`compared`,
+			`compared_time`)
+		values(
+			#{merchOrderSn},
+			#{payStatus},
+			#{orderAmount},
+			#{refundAmount},
+			#{orderStatus},
+			#{payFlag},
+			#{payTime},
+			#{importTime},
+			#{importer},
+			#{compared},
+			#{comparedTime})
+	</insert>
+
+	<update id="update" parameterType="com.kmall.admin.entity.compared.PayOrderInfoEntity">
+		update mall_pay_order_info
+		<set>
+			<if test="merchOrderSn != null">`merch_order_sn` = #{merchOrderSn}, </if>
+			<if test="payStatus != null">`pay_status` = #{payStatus}, </if>
+			<if test="orderAmount != null">`order_amount` = #{orderAmount}, </if>
+			<if test="refundAmount != null">`refund_amount` = #{refundAmount}, </if>
+			<if test="orderStatus != null">`order_status` = #{orderStatus}, </if>
+			<if test="payFlag != null">`pay_flag` = #{payFlag}, </if>
+			<if test="payTime != null">`pay_time` = #{payTime}, </if>
+			<if test="importTime != null">`import_time` = #{importTime}, </if>
+			<if test="importer != null">`importer` = #{importer}, </if>
+			<if test="compared != null">`compared` = #{compared}, </if>
+			<if test="comparedTime != null">`compared_time` = #{comparedTime}</if>
+		</set>
+		where mpoi_id = #{mpoiId}
+	</update>
+
+	<delete id="delete">
+		delete from mall_pay_order_info where mpoi_id = #{value}
+	</delete>
+
+	<delete id="deleteBatch">
+		delete from mall_pay_order_info where mpoi_id in
+		<foreach item="mpoiId" collection="array" open="(" separator="," close=")">
+			#{mpoiId}
+		</foreach>
+	</delete>
+
+	<insert id="saveBatch" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id">
+
+		insert into mall_pay_order_info(
+		`merch_order_sn`,
+		`pay_status`,
+		`order_amount`,
+		`refund_amount`,
+		`order_status`,
+		`pay_flag`,
+		`pay_time`,
+		`import_time`,
+		`importer`,
+		`compared`,
+		`compared_time`)
+		values
+		<foreach collection="list" index="index" item="item" separator=",">
+			(
+			#{item.merchOrderSn},
+			#{item.payStatus},
+			#{item.orderAmount},
+			#{item.refundAmount},
+			#{item.orderStatus},
+			#{item.payFlag},
+			#{item.payTime},
+			#{item.importTime},
+			#{item.importer},
+			#{item.compared},
+			#{item.comparedTime}
+			)
+		</foreach>
+
+	</insert>
+
+	<select id="queryNoComparedOrder" resultType="com.kmall.admin.entity.compared.PayOrderInfoEntity">
+		select
+		`mpoi_id`,
+		`merch_order_sn`,
+		`pay_status`,
+		`order_amount`,
+		`refund_amount`,
+		`order_status`,
+		`pay_flag`,
+		`pay_time`,
+		`import_time`,
+		`importer`,
+		`compared`,
+		`compared_time`
+		from mall_pay_order_info
+		WHERE 1=1
+		AND compared = 0
+		order by mpoi_id desc
+	</select>
+
+	<update id="updateBatch" parameterType="java.util.List">
+		<foreach collection="list" item="oderInfo" index="index" open="" close="" separator=";">
+			update mall_pay_order_info
+			<set>
+				<if test="oderInfo.compared != null">`compared` = #{oderInfo.compared}, </if>
+				<if test="oderInfo.comparedTime != null">`compared_time` = #{oderInfo.comparedTime}</if>
+			</set>
+			where mpoi_id = #{oderInfo.mpoiId}
+		</foreach>
+	</update>
+
+</mapper>

kmall-admin/src/main/webapp/WEB-INF/page/compared/ordercomparederror.html

@@ -0,0 +1,54 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title></title>
+    #parse("sys/header.html")
+</head>
+<body>
+<div id="rrapp" v-cloak>
+	<div v-show="showList">
+        <Row :gutter="16">
+            <div class="search-group">
+                <i-col span="4">
+                    <i-input v-model="q.name" @on-enter="query" placeholder="名称"/>
+                </i-col>
+                <i-button @click="query">查询</i-button>
+                <i-button @click="reloadSearch">重置</i-button>
+            </div>
+            <div class="buttons-group">
+                <i-button type="info" @click="add"><i class="fa fa-plus"></i>&nbsp;新增</i-button>
+                <i-button type="warning" @click="update"><i class="fa fa-pencil-square-o"></i>&nbsp;修改</i-button>
+                <i-button type="error" @click="del"><i class="fa fa-trash-o"></i>&nbsp;删除</i-button>
+            </div>
+        </Row>
+	    <table id="jqGrid"></table>
+	    <div id="jqGridPager"></div>
+    </div>
+
+    <Card v-show="!showList">
+        <p slot="title">{{title}}</p>
+		<i-form ref="formValidate" :model="orderComparedError" :rules="ruleValidate" :label-width="80">
+            <Form-item label="" prop="merchOrderSn">
+                <i-input v-model="orderComparedError.merchOrderSn" placeholder=""/>
+            </Form-item>
+            <Form-item label="" prop="orderAmount">
+                <i-input v-model="orderComparedError.orderAmount" placeholder=""/>
+            </Form-item>
+            <Form-item label="" prop="orderSource">
+                <i-input v-model="orderComparedError.orderSource" placeholder=""/>
+            </Form-item>
+            <Form-item label="" prop="createTime">
+                <i-input v-model="orderComparedError.createTime" placeholder=""/>
+            </Form-item>
+            <Form-item>
+                <i-button type="primary" @click="handleSubmit('formValidate')">提交</i-button>
+                <i-button type="warning" @click="reload" style="margin-left: 8px"/>返回</i-button>
+                <i-button type="ghost" @click="handleReset('formValidate')" style="margin-left: 8px">重置</i-button>
+            </Form-item>
+        </i-form>
+	</Card>
+</div>
+
+<script src="${rc.contextPath}/js/compared/ordercomparederror.js?_${date.systemTime}"></script>
+</body>
+</html>

kmall-admin/src/main/webapp/WEB-INF/page/compared/payorderinfo.html

@@ -0,0 +1,89 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title></title>
+    #parse("sys/header.html")
+</head>
+<body>
+<div id="rrapp" v-cloak>
+	<div v-show="showList">
+        <Row :gutter="16">
+            <div class="search-group">
+                <i-col span="4">
+                    <i-input v-model="q.name" @on-enter="query" placeholder="名称"/>
+                </i-col>
+                <i-button @click="query">查询</i-button>
+                <i-button @click="reloadSearch">重置</i-button>
+            </div>
+            <div class="buttons-group">
+                <i-button type="info" @click="compared"><i class="fa fa-plus"></i>&nbsp;对比</i-button>
+<!--                <i-button type="warning" @click="update"><i class="fa fa-pencil-square-o"></i>&nbsp;修改</i-button>-->
+<!--                <i-button type="error" @click="del"><i class="fa fa-trash-o"></i>&nbsp;删除</i-button>-->
+                <i-col style="display: inline-grid;">
+                    <Upload :show-upload-list="false" :on-success="uploadExcelSuccess" :on-error="uploadExcelError" :on-format-error="uploadExcelFormatError"
+                            :format="['xls','xlsx']"
+                            action="../payorderinfo/uploadAlipayOrder">
+                        <i-button type="ghost" icon="ios-cloud-upload-outline">支付宝支付订单导入</i-button>
+                    </Upload>
+                </i-col>
+                <i-col style="display: inline-grid;">
+                    <Upload :show-upload-list="false" :on-success="uploadExcelSuccess" :on-error="uploadExcelError" :on-format-error="uploadExcelFormatError"
+                            :format="['xls','xlsx']"
+                            action="../payorderinfo/uploadWXOrder">
+                        <i-button type="ghost" icon="ios-cloud-upload-outline">微信支付订单导入</i-button>
+                    </Upload>
+                </i-col>
+            </div>
+        </Row>
+	    <table id="jqGrid"></table>
+	    <div id="jqGridPager"></div>
+    </div>
+
+    <Card v-show="!showList">
+        <p slot="title">{{title}}</p>
+		<i-form ref="formValidate" :model="payOrderInfo" :rules="ruleValidate" :label-width="80">
+            <Form-item label="" prop="merchOrderSn">
+                <i-input v-model="payOrderInfo.merchOrderSn" placeholder=""/>
+            </Form-item>
+            <Form-item label="" prop="payStatus">
+                <i-input v-model="payOrderInfo.payStatus" placeholder=""/>
+            </Form-item>
+            <Form-item label="" prop="orderAmount">
+                <i-input v-model="payOrderInfo.orderAmount" placeholder=""/>
+            </Form-item>
+            <Form-item label="" prop="refundAmount">
+                <i-input v-model="payOrderInfo.refundAmount" placeholder=""/>
+            </Form-item>
+            <Form-item label="" prop="orderStatus">
+                <i-input v-model="payOrderInfo.orderStatus" placeholder=""/>
+            </Form-item>
+            <Form-item label="" prop="payFlag">
+                <i-input v-model="payOrderInfo.payFlag" placeholder=""/>
+            </Form-item>
+            <Form-item label="" prop="payTime">
+                <i-input v-model="payOrderInfo.payTime" placeholder=""/>
+            </Form-item>
+            <Form-item label="" prop="importTime">
+                <i-input v-model="payOrderInfo.importTime" placeholder=""/>
+            </Form-item>
+            <Form-item label="" prop="importer">
+                <i-input v-model="payOrderInfo.importer" placeholder=""/>
+            </Form-item>
+            <Form-item label="" prop="compared">
+                <i-input v-model="payOrderInfo.compared" placeholder=""/>
+            </Form-item>
+            <Form-item label="" prop="comparedTime">
+                <i-input v-model="payOrderInfo.comparedTime" placeholder=""/>
+            </Form-item>
+            <Form-item>
+                <i-button type="primary" @click="handleSubmit('formValidate')">提交</i-button>
+                <i-button type="warning" @click="reload" style="margin-left: 8px"/>返回</i-button>
+                <i-button type="ghost" @click="handleReset('formValidate')" style="margin-left: 8px">重置</i-button>
+            </Form-item>
+        </i-form>
+	</Card>
+</div>
+
+<script src="${rc.contextPath}/js/compared/payorderinfo.js?_${date.systemTime}"></script>
+</body>
+</html>

kmall-admin/src/main/webapp/js/compared/ordercomparederror.js

@@ -0,0 +1,140 @@
+$(function () {
+    $("#jqGrid").jqGrid({
+        url: '../ordercomparederror/list',
+        datatype: "json",
+        colModel: [
+			{label: 'moceId', name: 'moceId', index: 'moce_id', key: true, hidden: true},
+			{label: '订单号', name: 'merchOrderSn', index: 'merch_order_sn', width: 80},
+			],
+		viewrecords: true,
+        height: 550,
+        rowNum: 10,
+        rowList: [10, 30, 50],
+        rownumbers: true,
+        rownumWidth: 25,
+        autowidth: true,
+        multiselect: true,
+        pager: "#jqGridPager",
+        jsonReader: {
+            root: "page.list",
+            page: "page.currPage",
+            total: "page.totalPage",
+            records: "page.totalCount"
+        },
+        prmNames: {
+            page: "page",
+            rows: "limit",
+            order: "order"
+        },
+        gridComplete: function () {
+            $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "hidden"});
+        }
+    });
+});
+
+let vm = new Vue({
+	el: '#rrapp',
+	data: {
+        showList: true,
+        title: null,
+		orderComparedError: {},
+		ruleValidate: {
+			name: [
+				{required: true, message: '名称不能为空', trigger: 'blur'}
+			]
+		},
+		q: {
+		    name: ''
+		}
+	},
+	methods: {
+		query: function () {
+			vm.reload();
+		},
+		add: function () {
+			vm.showList = false;
+			vm.title = "新增";
+			vm.orderComparedError = {};
+		},
+		update: function (event) {
+            let moceId = getSelectedRow();
+			if (moceId == null) {
+				return;
+			}
+			vm.showList = false;
+            vm.title = "修改";
+
+            vm.getInfo(moceId)
+		},
+		saveOrUpdate: function (event) {
+            let url = vm.orderComparedError.moceId == null ? "../ordercomparederror/save" : "../ordercomparederror/update";
+			$.ajax({
+				type: "POST",
+			    url: url,
+			    contentType: "application/json",
+			    data: JSON.stringify(vm.orderComparedError),
+                success: function (r) {
+                    if (r.code === 0) {
+                        alert('操作成功', function (index) {
+                            vm.reload();
+                        });
+                    } else {
+                        alert(r.msg);
+                    }
+                }
+			});
+		},
+		del: function (event) {
+            let moceIds = getSelectedRows();
+			if (moceIds == null){
+				return;
+			}
+
+			confirm('确定要删除选中的记录？', function () {
+				$.ajax({
+					type: "POST",
+				    url: "../ordercomparederror/delete",
+				    contentType: "application/json",
+				    data: JSON.stringify(moceIds),
+				    success: function (r) {
+						if (r.code == 0) {
+							alert('操作成功', function (index) {
+								$("#jqGrid").trigger("reloadGrid");
+							});
+						} else {
+							alert(r.msg);
+						}
+					}
+				});
+			});
+		},
+		getInfo: function(moceId){
+			$.get("../ordercomparederror/info/"+moceId, function (r) {
+                vm.orderComparedError = r.orderComparedError;
+            });
+		},
+        reloadSearch: function() {
+            vm.q = {
+                name: ''
+            }
+            vm.reload();
+		},
+		reload: function (event) {
+			vm.showList = true;
+            let page = $("#jqGrid").jqGrid('getGridParam', 'page');
+			$("#jqGrid").jqGrid('setGridParam', {
+                postData: {'name': vm.q.name},
+                page: page
+            }).trigger("reloadGrid");
+            vm.handleReset('formValidate');
+		},
+        handleSubmit: function (name) {
+            handleSubmitValidate(this, name, function () {
+                vm.saveOrUpdate()
+            });
+        },
+        handleReset: function (name) {
+            handleResetForm(this, name);
+        }
+	}
+});

kmall-admin/src/main/webapp/js/compared/payorderinfo.js

@@ -0,0 +1,175 @@
+
+$(function () {
+    $("#jqGrid").jqGrid({
+        url: '../payorderinfo/list',
+        datatype: "json",
+        colModel: [
+			{label: 'mpoiId', name: 'mpoiId', index: 'mpoi_id', key: true, hidden: true},
+			{label: '商户订单编号', name: 'merchOrderSn', index: 'merch_order_sn', width: 80},
+			{label: '支付状态', name: 'payStatus', index: 'pay_status', width: 80},
+			{label: '支付金额', name: 'orderAmount', index: 'order_amount', width: 80},
+			{label: '退款金额', name: 'refundAmount', index: 'refund_amount', width: 80},
+			{label: '订单状态', name: 'orderStatus', index: 'order_status', width: 80},
+			{label: '支付方式', name: 'payFlag', index: 'pay_flag', width: 80},
+			{label: '支付时间', name: 'payTime', index: 'pay_time', width: 80},
+			{label: '导入时间', name: 'importTime', index: 'import_time', width: 80},
+			{label: '导入人', name: 'importer', index: 'importer', width: 80},
+			{label: '是否对比', name: 'compared', index: 'compared', width: 80},
+			{label: '对比时间', name: 'comparedTime', index: 'compared_time', width: 80}],
+		viewrecords: true,
+        height: 550,
+        rowNum: 10,
+        rowList: [10, 30, 50],
+        rownumbers: true,
+        rownumWidth: 25,
+        autowidth: true,
+        multiselect: true,
+        pager: "#jqGridPager",
+        jsonReader: {
+            root: "page.list",
+            page: "page.currPage",
+            total: "page.totalPage",
+            records: "page.totalCount"
+        },
+        prmNames: {
+            page: "page",
+            rows: "limit",
+            order: "order"
+        },
+        gridComplete: function () {
+            $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "hidden"});
+        }
+    });
+});
+
+let vm = new Vue({
+	el: '#rrapp',
+	data: {
+        showList: true,
+        title: null,
+		payOrderInfo: {},
+		ruleValidate: {
+			name: [
+				{required: true, message: '名称不能为空', trigger: 'blur'}
+			]
+		},
+		q: {
+		    name: ''
+		}
+	},
+	methods: {
+		query: function () {
+			vm.reload();
+		},
+		compared: function () {
+			$.get("../ordercomparederror/comparedOrder", function (r) {
+				alert(r.msg);
+				//vm.mall2OrderingEarlyWarningReminds = r.mall2OrderingEarlyWarningReminds;
+			});
+		},
+		add: function () {
+			vm.showList = false;
+			vm.title = "新增";
+			vm.payOrderInfo = {};
+		},
+		update: function (event) {
+            let mpoiId = getSelectedRow();
+			if (mpoiId == null) {
+				return;
+			}
+			vm.showList = false;
+            vm.title = "修改";
+
+            vm.getInfo(mpoiId)
+		},
+		saveOrUpdate: function (event) {
+            let url = vm.payOrderInfo.mpoiId == null ? "../payorderinfo/save" : "../payorderinfo/update";
+			$.ajax({
+				type: "POST",
+			    url: url,
+			    contentType: "application/json",
+			    data: JSON.stringify(vm.payOrderInfo),
+                success: function (r) {
+                    if (r.code === 0) {
+                        alert('操作成功', function (index) {
+                            vm.reload();
+                        });
+                    } else {
+                        alert(r.msg);
+                    }
+                }
+			});
+		},
+		del: function (event) {
+            let mpoiIds = getSelectedRows();
+			if (mpoiIds == null){
+				return;
+			}
+
+			confirm('确定要删除选中的记录？', function () {
+				$.ajax({
+					type: "POST",
+				    url: "../payorderinfo/delete",
+				    contentType: "application/json",
+				    data: JSON.stringify(mpoiIds),
+				    success: function (r) {
+						if (r.code == 0) {
+							alert('操作成功', function (index) {
+								$("#jqGrid").trigger("reloadGrid");
+							});
+						} else {
+							alert(r.msg);
+						}
+					}
+				});
+			});
+		},
+		getInfo: function(mpoiId){
+			$.get("../payorderinfo/info/"+mpoiId, function (r) {
+                vm.payOrderInfo = r.payOrderInfo;
+            });
+		},
+		uploadExcelSuccess: function (data) {
+			// console.log(data);
+			if(data.code==0){
+				alert('导入成功', function (index) {
+					$("#jqGrid").trigger("reloadGrid");
+				});
+			}else{
+				alert(data.msg);
+			}
+		},
+		uploadExcelError: function () {
+			alert('上传出现异常，请重试！');
+		},
+		uploadExcelFormatError: function (file) {
+			this.$Notice.warning({
+				title: '文件格式不正确',
+				desc: '文件 ' + file.name + ' 格式不正确，请上传 xls 或 xlsx 格式的文件。'
+			});
+		},
+        reloadSearch: function() {
+            vm.q = {
+                name: ''
+            }
+            vm.reload();
+		},
+		reload: function (event) {
+			vm.showList = true;
+            let page = $("#jqGrid").jqGrid('getGridParam', 'page');
+			$("#jqGrid").jqGrid('setGridParam', {
+                postData: {'name': vm.q.name},
+                page: page
+            }).trigger("reloadGrid");
+            vm.handleReset('formValidate');
+		},
+        handleSubmit: function (name) {
+            handleSubmitValidate(this, name, function () {
+                vm.saveOrUpdate()
+            });
+        },
+        handleReset: function (name) {
+            handleResetForm(this, name);
+        }
+	}
+});

kmall-admin/src/main/webapp/js/mk/mkactivitiespromotion.js

@@ -32,7 +32,7 @@ $(function () {
 			{label: '商品系列', name: 'productSeries', index: 'product_series', width: 80, align: 'center'},
 			{label: '截止日期', name: 'deadline', index: 'deadline', width: 80, align: 'center'}],
 		viewrecords: true,
-		postData:{storeId:storeId},
+		postData: {'mkaId': vm.mkaId},
         height: 550,
         rowNum: 10,
         rowList: [10, 30, 50],

kmall-admin/src/main/webapp/js/pcd/hbk6zzez.js

@@ -36,9 +36,9 @@ function openWebSocket() {
 		//注意ws、wss使用不同的端口。我使用自签名的证书测试，
 		//无法使用wss，浏览器打开WebSocket时报错
 		//ws对应http、wss对应https。
-		// webSocket = new WebSocket("ws://183.62.225.124:8080/ws/server/"+storeId);
+		webSocket = new WebSocket("ws://8.135.102.238/:8080/ws/server/"+storeId);
 		// webSocket = new WebSocket("ws://127.0.0.1:8080/ws/server/163");
-		webSocket = new WebSocket("wss://cb.k1net.cn/ws/server/"+storeId);
+		// webSocket = new WebSocket("wss://cb.k1net.cn/ws/server/"+storeId);
 		if (webSocket.readyState === webSocket.CONNECTING) {
 			console.log('1.连接正在打开......');
 		}
@@ -93,4 +93,4 @@ function closeWebSocket() {
 //窗口关闭时，关闭连接
 window.unload = function () {
 	webSocket.close();
-};
+};

kmall-common/src/main/java/com/kmall/common/constant/JxlsXmlTemplateName.java

@@ -44,5 +44,9 @@ public class JxlsXmlTemplateName {
     public static final String COMBINATION_PRICE_GOODS_DTO_LIST = "/XmlTemplate/CombinationPriceGoodsDtoList.xml";
     // 全场折扣商品导入
     public static final String DISCOUNTED_PRODUCTS_DTO_LIST = "/XmlTemplate/DiscountedProductsDtoList.xml";
+    // 支付宝订单导入
+    public static final String ALIPAY_PAY_ORDER_DTO_LIST = "/XmlTemplate/AlipayPayOrderDtoList.xml";
+    // 支付宝订单导入
+    public static final String WX_PAY_ORDER_DTO_LIST = "/XmlTemplate/WXPayOrderDtoList.xml";
 
 }