新增海控会员积分和推送订单相关页面

kmall-admin/src/main/java/com/kmall/admin/controller/haikong/HaikongMemberOrderSyncResendController.java

@@ -0,0 +1,108 @@
+package com.kmall.admin.controller.haikong;
+
+import java.util.List;
+import java.util.Map;
+
+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.*;
+
+
+import com.kmall.admin.entity.haikong.HaiKongMemberOrderSyncResendEntity;
+import com.kmall.admin.service.haikong.HaiKongMemberOrderSyncResendService;
+
+
+/**
+ * 会员同步消费订单记录Controller
+ *
+ * @author emato
+ * @email admin@qhdswl.com
+ * @date 2021-12-13 18:54:48
+ */
+@Controller
+@RequestMapping("haikongmemberordersyncresend")
+public class HaikongMemberOrderSyncResendController {
+    @Autowired
+    private HaiKongMemberOrderSyncResendService haikongMemberOrderSyncResendService;
+
+    /**
+     * 查看列表
+     */
+    @RequestMapping("/list")
+    @ResponseBody
+    public R list(@RequestParam Map<String, Object> params) {
+        //查询列表数据
+        Query query = new Query(params);
+
+        List<HaiKongMemberOrderSyncResendEntity> haikongMemberOrderSyncResendList = haikongMemberOrderSyncResendService.queryList(query);
+        int total = haikongMemberOrderSyncResendService.queryTotal(query);
+
+        PageUtils pageUtil = new PageUtils(haikongMemberOrderSyncResendList, total, query.getLimit(), query.getPage());
+
+        return R.ok().put("page", pageUtil);
+    }
+
+    /**
+     * 查看信息
+     */
+    @RequestMapping("/info/{id}")
+    @RequiresPermissions("haikongmemberordersyncresend:info")
+    @ResponseBody
+    public R info(@PathVariable("id") Integer id) {
+        HaiKongMemberOrderSyncResendEntity haikongMemberOrderSyncResend = haikongMemberOrderSyncResendService.queryObject(id);
+
+        return R.ok().put("haikongMemberOrderSyncResend", haikongMemberOrderSyncResend);
+    }
+
+    /**
+     * 保存
+     */
+    @RequestMapping("/save")
+    @RequiresPermissions("haikongmemberordersyncresend:save")
+    @ResponseBody
+    public R save(@RequestBody HaiKongMemberOrderSyncResendEntity haikongMemberOrderSyncResend) {
+        haikongMemberOrderSyncResendService.save(haikongMemberOrderSyncResend);
+
+        return R.ok();
+    }
+
+    /**
+     * 修改
+     */
+    @RequestMapping("/update")
+    @RequiresPermissions("haikongmemberordersyncresend:update")
+    @ResponseBody
+    public R update(@RequestBody HaiKongMemberOrderSyncResendEntity haikongMemberOrderSyncResend) {
+        haikongMemberOrderSyncResendService.update(haikongMemberOrderSyncResend);
+
+        return R.ok();
+    }
+
+    /**
+     * 删除
+     */
+    @RequestMapping("/delete")
+    @RequiresPermissions("haikongmemberordersyncresend:delete")
+    @ResponseBody
+    public R delete(@RequestBody Integer[] ids) {
+        // haikongMemberOrderSyncResendService.deleteBatch(ids);
+
+        return R.ok();
+    }
+
+    /**
+     * 查看所有列表
+     */
+    @RequestMapping("/queryAll")
+    @ResponseBody
+    public R queryAll(@RequestParam Map<String, Object> params) {
+
+        List<HaiKongMemberOrderSyncResendEntity> list = haikongMemberOrderSyncResendService.queryList("");
+
+        return R.ok().put("list", list);
+    }
+}

kmall-admin/src/main/java/com/kmall/admin/controller/haikong/HaikongMemberScoreChangeDetailRecordController.java

@@ -0,0 +1,86 @@
+package com.kmall.admin.controller.haikong;
+
+import java.util.List;
+import java.util.Map;
+
+import com.kmall.admin.entity.haikong.HaiKongMemberScoreChangeDetailRecordEntity;
+import com.kmall.admin.service.haikong.HaiKongMemberScoreChangeDetailRecordService;
+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 2021-12-13 18:54:48
+ */
+@Controller
+@RequestMapping("haikongmemberscorechangedetailrecord")
+public class HaikongMemberScoreChangeDetailRecordController {
+    @Autowired
+    private HaiKongMemberScoreChangeDetailRecordService haikongMemberScoreChangeDetailRecordService;
+
+    /**
+     * 查看列表
+     */
+    @RequestMapping("/list")
+    @ResponseBody
+    public R list(@RequestParam Map<String, Object> params) {
+        //查询列表数据
+        Query query = new Query(params);
+
+        List<HaiKongMemberScoreChangeDetailRecordEntity> haikongMemberScoreChangeDetailRecordList = haikongMemberScoreChangeDetailRecordService.queryList(query);
+        int total = haikongMemberScoreChangeDetailRecordService.queryTotal(query);
+
+        PageUtils pageUtil = new PageUtils(haikongMemberScoreChangeDetailRecordList, total, query.getLimit(), query.getPage());
+
+        return R.ok().put("page", pageUtil);
+    }
+
+    /**
+     * 保存
+     */
+    @RequestMapping("/save")
+    @RequiresPermissions("haikongmemberscorechangedetailrecord:save")
+    @ResponseBody
+    public R save(@RequestBody HaiKongMemberScoreChangeDetailRecordEntity haikongMemberScoreChangeDetailRecord) {
+        haikongMemberScoreChangeDetailRecordService.save(haikongMemberScoreChangeDetailRecord);
+
+        return R.ok();
+    }
+
+    /**
+     * 修改
+     */
+    @RequestMapping("/update")
+    @RequiresPermissions("haikongmemberscorechangedetailrecord:update")
+    @ResponseBody
+    public R update(@RequestBody HaiKongMemberScoreChangeDetailRecordEntity haikongMemberScoreChangeDetailRecord) {
+        // haikongMemberScoreChangeDetailRecordService.update(haikongMemberScoreChangeDetailRecord);
+
+        return R.ok();
+    }
+
+    /**
+     * 删除
+     */
+    @RequestMapping("/delete")
+    @RequiresPermissions("haikongmemberscorechangedetailrecord:delete")
+    @ResponseBody
+    public R delete(@RequestBody Integer[]ids) {
+        // haikongMemberScoreChangeDetailRecordService.deleteBatch(ids);
+
+        return R.ok();
+    }
+
+
+}

kmall-admin/src/main/java/com/kmall/admin/controller/haikong/HaikongMemberScoreChangeRecordController.java

@@ -0,0 +1,86 @@
+package com.kmall.admin.controller.haikong;
+
+import java.util.List;
+import java.util.Map;
+
+import com.kmall.admin.entity.haikong.HaiKongMemberScoreChangeRecordEntity;
+import com.kmall.admin.service.haikong.HaiKongMemberScoreChangeRecordService;
+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 2021-12-13 18:54:48
+ */
+@Controller
+@RequestMapping("haikongmemberscorechangerecord")
+public class HaikongMemberScoreChangeRecordController {
+    @Autowired
+    private HaiKongMemberScoreChangeRecordService haikongMemberScoreChangeRecordService;
+
+    /**
+     * 查看列表
+     */
+    @RequestMapping("/list")
+    @ResponseBody
+    public R list(@RequestParam Map<String, Object> params) {
+        //查询列表数据
+        Query query = new Query(params);
+
+        List<HaiKongMemberScoreChangeRecordEntity> haikongMemberScoreChangeRecordList = haikongMemberScoreChangeRecordService.queryList(query);
+        int total = haikongMemberScoreChangeRecordService.queryTotal(query);
+
+        PageUtils pageUtil = new PageUtils(haikongMemberScoreChangeRecordList, total, query.getLimit(), query.getPage());
+
+        return R.ok().put("page", pageUtil);
+    }
+
+
+    /**
+     * 保存
+     */
+    @RequestMapping("/save")
+    @RequiresPermissions("haikongmemberscorechangerecord:save")
+    @ResponseBody
+    public R save(@RequestBody HaiKongMemberScoreChangeRecordEntity haikongMemberScoreChangeRecord) {
+        haikongMemberScoreChangeRecordService.save(haikongMemberScoreChangeRecord);
+
+        return R.ok();
+    }
+
+    /**
+     * 修改
+     */
+    @RequestMapping("/update")
+    @RequiresPermissions("haikongmemberscorechangerecord:update")
+    @ResponseBody
+    public R update(@RequestBody HaiKongMemberScoreChangeRecordEntity haikongMemberScoreChangeRecord) {
+        // haikongMemberScoreChangeRecordService.update(haikongMemberScoreChangeRecord);
+
+        return R.ok();
+    }
+
+    /**
+     * 删除
+     */
+    @RequestMapping("/delete")
+    @RequiresPermissions("haikongmemberscorechangerecord:delete")
+    @ResponseBody
+    public R delete(@RequestBody Integer[]ids) {
+        // haikongMemberScoreChangeRecordService.deleteBatch(ids);
+
+        return R.ok();
+    }
+
+}

kmall-admin/src/main/java/com/kmall/admin/controller/haikong/HaikongSendOrderInfoDetailRecordController.java

@@ -0,0 +1,106 @@
+package com.kmall.admin.controller.haikong;
+
+import java.util.List;
+import java.util.Map;
+
+import com.kmall.admin.entity.haikong.HaiKongSendOrderInfoDetailRecordEntity;
+import com.kmall.admin.service.haikong.HaiKongSendOrderInfoDetailRecordService;
+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 2021-12-13 18:54:48
+ */
+@Controller
+@RequestMapping("haikongsendorderinfodetailrecord")
+public class HaikongSendOrderInfoDetailRecordController {
+    @Autowired
+    private HaiKongSendOrderInfoDetailRecordService haikongSendOrderInfoDetailRecordService;
+
+    /**
+     * 查看列表
+     */
+    @RequestMapping("/list")
+    @ResponseBody
+    public R list(@RequestParam Map<String, Object> params) {
+        //查询列表数据
+        Query query = new Query(params);
+
+        List<HaiKongSendOrderInfoDetailRecordEntity> haikongSendOrderInfoDetailRecordList = haikongSendOrderInfoDetailRecordService.queryList(query);
+        int total = haikongSendOrderInfoDetailRecordService.queryTotal(query);
+
+        PageUtils pageUtil = new PageUtils(haikongSendOrderInfoDetailRecordList, total, query.getLimit(), query.getPage());
+
+        return R.ok().put("page", pageUtil);
+    }
+
+    /**
+     * 查看信息
+     */
+    @RequestMapping("/info/{id}")
+    @RequiresPermissions("haikongsendorderinfodetailrecord:info")
+    @ResponseBody
+    public R info(@PathVariable("id") Integer id) {
+        HaiKongSendOrderInfoDetailRecordEntity haikongSendOrderInfoDetailRecord = haikongSendOrderInfoDetailRecordService.queryObject(id);
+
+        return R.ok().put("haikongSendOrderInfoDetailRecord", haikongSendOrderInfoDetailRecord);
+    }
+
+    /**
+     * 保存
+     */
+    @RequestMapping("/save")
+    @RequiresPermissions("haikongsendorderinfodetailrecord:save")
+    @ResponseBody
+    public R save(@RequestBody HaiKongSendOrderInfoDetailRecordEntity haikongSendOrderInfoDetailRecord) {
+        haikongSendOrderInfoDetailRecordService.save(haikongSendOrderInfoDetailRecord);
+
+        return R.ok();
+    }
+
+    /**
+     * 修改
+     */
+    @RequestMapping("/update")
+    @RequiresPermissions("haikongsendorderinfodetailrecord:update")
+    @ResponseBody
+    public R update(@RequestBody HaiKongSendOrderInfoDetailRecordEntity haikongSendOrderInfoDetailRecord) {
+        haikongSendOrderInfoDetailRecordService.update(haikongSendOrderInfoDetailRecord);
+
+        return R.ok();
+    }
+
+    /**
+     * 删除
+     */
+    @RequestMapping("/delete")
+    @RequiresPermissions("haikongsendorderinfodetailrecord:delete")
+    @ResponseBody
+    public R delete(@RequestBody Integer[]ids) {
+        // haikongSendOrderInfoDetailRecordService.deleteBatch(ids);
+
+        return R.ok();
+    }
+
+    /**
+     * 查看所有列表
+     */
+    @RequestMapping("/queryAll")
+    @ResponseBody
+    public R queryAll(@RequestParam Map<String, Object> params) {
+
+        List<HaiKongSendOrderInfoDetailRecordEntity> list = haikongSendOrderInfoDetailRecordService.queryList(params);
+
+        return R.ok().put("list", list);
+    }
+}

kmall-admin/src/main/java/com/kmall/admin/controller/haikong/HaikongSendOrderInfoRecordController.java

@@ -0,0 +1,107 @@
+package com.kmall.admin.controller.haikong;
+
+import java.util.List;
+import java.util.Map;
+
+import com.kmall.admin.entity.haikong.HaiKongSendOrderInfoRecordEntity;
+import com.kmall.admin.service.haikong.HaiKongSendOrderInfoRecordService;
+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 2021-12-13 18:54:48
+ */
+@Controller
+@RequestMapping("haikongsendorderinforecord")
+public class HaikongSendOrderInfoRecordController {
+    @Autowired
+    private HaiKongSendOrderInfoRecordService haikongSendOrderInfoRecordService;
+
+    /**
+     * 查看列表
+     */
+    @RequestMapping("/list")
+    @ResponseBody
+    public R list(@RequestParam Map<String, Object> params) {
+        //查询列表数据
+        Query query = new Query(params);
+
+        List<HaiKongSendOrderInfoRecordEntity> haikongSendOrderInfoRecordList = haikongSendOrderInfoRecordService.queryList(query);
+        int total = haikongSendOrderInfoRecordService.queryTotal(query);
+
+        PageUtils pageUtil = new PageUtils(haikongSendOrderInfoRecordList, total, query.getLimit(), query.getPage());
+
+        return R.ok().put("page", pageUtil);
+    }
+
+    /**
+     * 查看信息
+     */
+    @RequestMapping("/info/{id}")
+    @RequiresPermissions("haikongsendorderinforecord:info")
+    @ResponseBody
+    public R info(@PathVariable("id") Integer id) {
+        HaiKongSendOrderInfoRecordEntity haikongSendOrderInfoRecord = haikongSendOrderInfoRecordService.queryObject(id);
+
+        return R.ok().put("haikongSendOrderInfoRecord", haikongSendOrderInfoRecord);
+    }
+
+    /**
+     * 保存
+     */
+    @RequestMapping("/save")
+    @RequiresPermissions("haikongsendorderinforecord:save")
+    @ResponseBody
+    public R save(@RequestBody HaiKongSendOrderInfoRecordEntity haikongSendOrderInfoRecord) {
+        haikongSendOrderInfoRecordService.save(haikongSendOrderInfoRecord);
+
+        return R.ok();
+    }
+
+    /**
+     * 修改
+     */
+    @RequestMapping("/update")
+    @RequiresPermissions("haikongsendorderinforecord:update")
+    @ResponseBody
+    public R update(@RequestBody HaiKongSendOrderInfoRecordEntity haikongSendOrderInfoRecord) {
+        haikongSendOrderInfoRecordService.update(haikongSendOrderInfoRecord);
+
+        return R.ok();
+    }
+
+    /**
+     * 删除
+     */
+    @RequestMapping("/delete")
+    @RequiresPermissions("haikongsendorderinforecord:delete")
+    @ResponseBody
+    public R delete(@RequestBody Integer[]ids) {
+        // haikongSendOrderInfoRecordService.deleteBatch(ids);
+
+        return R.ok();
+    }
+
+    /**
+     * 查看所有列表
+     */
+    @RequestMapping("/queryAll")
+    @ResponseBody
+    public R queryAll(@RequestParam Map<String, Object> params) {
+
+        List<HaiKongSendOrderInfoRecordEntity> list = haikongSendOrderInfoRecordService.queryList(params);
+
+        return R.ok().put("list", list);
+    }
+}

kmall-admin/src/main/java/com/kmall/admin/dao/haikong/HaiKongMemberOrderSyncResendDao.java

@@ -5,6 +5,7 @@ import com.kmall.manager.dao.BaseDao;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 海控同步消费订单重发表
@@ -66,4 +67,18 @@ public interface HaiKongMemberOrderSyncResendDao {
     List<HaiKongMemberOrderSyncResendEntity> queryListByResendStatus();
 
     void updateResendStatusBatch(List<HaiKongMemberOrderSyncResendEntity> entities);
+
+    /**
+     * 查询列表数据
+     * @param map
+     * @return
+     */
+    List<HaiKongMemberOrderSyncResendEntity> queryListNew(Map<String, Object> map);
+
+    /**
+     * 查询总数
+     * @param map
+     * @return
+     */
+    Integer queryTotalNew(Map<String, Object> map);
 }

kmall-admin/src/main/java/com/kmall/admin/dao/haikong/HaiKongMemberScoreChangeDetailRecordDao.java

@@ -4,6 +4,7 @@ import com.kmall.admin.entity.haikong.HaiKongMemberScoreChangeDetailRecordEntity
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 同步会员系统积分，订单详情
@@ -39,4 +40,18 @@ public interface HaiKongMemberScoreChangeDetailRecordDao {
      * @return          结果
      */
     int saveBatch(List<HaiKongMemberScoreChangeDetailRecordEntity> entities);
+
+    /**
+     * 查询列表
+     * @param map
+     * @return
+     */
+    List<HaiKongMemberScoreChangeDetailRecordEntity> queryList(Map<String, Object> map);
+
+    /**
+     * 查询总数
+     * @param map
+     * @return
+     */
+    Integer queryTotal(Map<String, Object> map);
 }

kmall-admin/src/main/java/com/kmall/admin/dao/haikong/HaiKongMemberScoreChangeRecordDao.java

@@ -5,6 +5,7 @@ import com.kmall.admin.entity.haikong.IntegralGoBackEntity;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 会员积分变动记录
@@ -39,4 +40,8 @@ public interface HaiKongMemberScoreChangeRecordDao {
      */
     void updateResendStatusBatch(List<HaiKongMemberScoreChangeRecordEntity> entities);
 
+    List<HaiKongMemberScoreChangeRecordEntity> queryListNew(Map<String, Object> map);
+
+    Integer queryTotalNew(Map<String, Object> map);
+
 }

kmall-admin/src/main/java/com/kmall/admin/service/haikong/HaiKongMemberOrderSyncResendService.java

@@ -39,4 +39,31 @@ public interface HaiKongMemberOrderSyncResendService {
     List<HaiKongMemberOrderSyncResendEntity> queryListByResendStatus();
 
     void updateResendStatusBatch(List<HaiKongMemberOrderSyncResendEntity> entities);
+
+
+    /**
+     * 分页查询
+     *
+     * @param map 参数
+     * @return list
+     */
+    List<HaiKongMemberOrderSyncResendEntity> queryList(Map<String, Object> map);
+
+    /**
+     * 分页统计总数
+     *
+     * @param map 参数
+     * @return 总数
+     */
+    int queryTotal(Map<String, Object> map);
+
+    /**
+     * 根据主键查询实体
+     *
+     * @param id 主键
+     * @return 实体
+     */
+    HaiKongMemberOrderSyncResendEntity queryObject(Integer id);
+
+
 }

kmall-admin/src/main/java/com/kmall/admin/service/haikong/HaiKongMemberScoreChangeDetailRecordService.java

@@ -4,6 +4,7 @@ import com.kmall.admin.entity.haikong.HaiKongMemberScoreChangeDetailRecordEntity
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author lhm
@@ -39,4 +40,20 @@ public interface HaiKongMemberScoreChangeDetailRecordService {
      */
     int saveBatch(List<HaiKongMemberScoreChangeDetailRecordEntity> entities);
 
+    /**
+     * 分页查询
+     *
+     * @param map 参数
+     * @return list
+     */
+    List<HaiKongMemberScoreChangeDetailRecordEntity> queryList(Map<String, Object> map);
+
+    /**
+     * 分页统计总数
+     *
+     * @param map 参数
+     * @return 总数
+     */
+    int queryTotal(Map<String, Object> map);
+
 }

kmall-admin/src/main/java/com/kmall/admin/service/haikong/HaiKongMemberScoreChangeRecordService.java

@@ -5,6 +5,7 @@ import com.kmall.admin.entity.haikong.IntegralGoBackEntity;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author lhm
@@ -37,4 +38,20 @@ public interface HaiKongMemberScoreChangeRecordService {
      */
     void updateResendStatusBatch(List<HaiKongMemberScoreChangeRecordEntity> entities);
 
+    /**
+     * 分页查询
+     *
+     * @param map 参数
+     * @return list
+     */
+    List<HaiKongMemberScoreChangeRecordEntity> queryList(Map<String, Object> map);
+
+    /**
+     * 分页统计总数
+     *
+     * @param map 参数
+     * @return 总数
+     */
+    int queryTotal(Map<String, Object> map);
+
 }

kmall-admin/src/main/java/com/kmall/admin/service/impl/haikong/HaiKongMemberOrderSyncResendServiceImpl.java

@@ -69,4 +69,20 @@ public class HaiKongMemberOrderSyncResendServiceImpl implements HaiKongMemberOrd
     public void updateResendStatusBatch(List<HaiKongMemberOrderSyncResendEntity> entities) {
         haiKongMemberOrderSyncResendDao.updateResendStatusBatch(entities);
     }
+
+    @Override
+    public List<HaiKongMemberOrderSyncResendEntity> queryList(Map<String, Object> map) {
+        return haiKongMemberOrderSyncResendDao.queryListNew(map);
+    }
+
+    @Override
+    public int queryTotal(Map<String, Object> map) {
+        return haiKongMemberOrderSyncResendDao.queryTotalNew(map);
+    }
+
+    @Override
+    public HaiKongMemberOrderSyncResendEntity queryObject(Integer id) {
+        return haiKongMemberOrderSyncResendDao.queryObject(id);
+    }
+
 }

kmall-admin/src/main/java/com/kmall/admin/service/impl/haikong/HaiKongMemberScoreChangeDetailRecordServiceImpl.java

@@ -8,6 +8,7 @@ import org.springframework.stereotype.Service;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author lhm
@@ -70,4 +71,14 @@ public class HaiKongMemberScoreChangeDetailRecordServiceImpl implements HaiKongM
         });
         return haiKongMemberScoreChangeDetailRecordDao.saveBatch(entities);
     }
+
+    @Override
+    public List<HaiKongMemberScoreChangeDetailRecordEntity> queryList(Map<String, Object> map) {
+        return haiKongMemberScoreChangeDetailRecordDao.queryList(map);
+    }
+
+    @Override
+    public int queryTotal(Map<String, Object> map) {
+        return haiKongMemberScoreChangeDetailRecordDao.queryTotal(map);
+    }
 }

kmall-admin/src/main/java/com/kmall/admin/service/impl/haikong/HaiKongMemberScoreChangeRecordServiceImpl.java

@@ -8,6 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 会员积分变动业务
@@ -77,4 +78,14 @@ public class HaiKongMemberScoreChangeRecordServiceImpl implements HaiKongMemberS
     public void updateResendStatusBatch(List<HaiKongMemberScoreChangeRecordEntity> entities) {
         haiKongMemberScoreChangeRecordDao.updateResendStatusBatch(entities);
     }
+
+    @Override
+    public List<HaiKongMemberScoreChangeRecordEntity> queryList(Map<String, Object> map) {
+        return haiKongMemberScoreChangeRecordDao.queryListNew(map);
+    }
+
+    @Override
+    public int queryTotal(Map<String, Object> map) {
+        return haiKongMemberScoreChangeRecordDao.queryTotalNew(map);
+    }
 }

kmall-admin/src/main/resources/mybatis/mapper/haikong/HaiKongMemberOrderSyncResendDao.xml

@@ -128,4 +128,43 @@
         </foreach>
     </delete>
 
+    <select id="queryListNew" resultType="com.kmall.admin.entity.haikong.HaiKongMemberOrderSyncResendEntity">
+        select
+        `id`,
+        `open_id`,
+        `phone`,
+        `consume_date`,
+        `order_amount`,
+        `order_no`,
+        `order_score`,
+        `member_sys_order_id`,
+        `resend_status`,
+        `last_resend_time`,
+        `create_time`
+        from haikong_member_order_sync_resend
+        WHERE 1=1
+        <if test="orderNo != null and orderNo.trim() != ''">
+            AND `order_no` LIKE concat('%',#{orderNo},'%')
+        </if>
+        <choose>
+            <when test="sidx != null and sidx.trim() != ''">
+                order by ${sidx} ${order}
+            </when>
+            <otherwise>
+                order by id desc
+            </otherwise>
+        </choose>
+        <if test="offset != null and limit != null">
+            limit #{offset}, #{limit}
+        </if>
+    </select>
+
+    <select id="queryTotalNew" resultType="int">
+        select count(*) from haikong_member_order_sync_resend
+        WHERE 1=1
+        <if test="orderNo != null and orderNo.trim() != ''">
+            AND `order_no` LIKE concat('%',#{orderNo},'%')
+        </if>
+    </select>
+
 </mapper>

kmall-admin/src/main/resources/mybatis/mapper/haikong/HaiKongMemberScoreChangeDetailRecordDao.xml

@@ -95,4 +95,45 @@
         delete from haikong_member_score_change_detail_record where order_sn = #{orderSn}
     </delete>
 
+    <select id="queryList" resultType="com.kmall.admin.entity.haikong.HaiKongMemberScoreChangeDetailRecordEntity">
+        select
+        `id`,
+        `order_sn`,
+        `product_barcode`,
+        `sku`,
+        `retail_price`,
+        `actual_price`,
+        `sell_volume`,
+        `deduction_score`,
+        `gift_score`,
+        `generate_rules`,
+        `generate_ratio`,
+        `create_time`,
+        `modify_time`
+        from haikong_member_score_change_detail_record
+        WHERE 1=1
+        <if test="orderSn != null and orderSn.trim() != ''">
+            AND `order_sn` LIKE concat('%',#{orderSn},'%')
+        </if>
+        <choose>
+            <when test="sidx != null and sidx.trim() != ''">
+                order by ${sidx} ${order}
+            </when>
+            <otherwise>
+                order by id desc
+            </otherwise>
+        </choose>
+        <if test="offset != null and limit != null">
+            limit #{offset}, #{limit}
+        </if>
+    </select>
+
+    <select id="queryTotal" resultType="int">
+        select count(*) from haikong_member_score_change_detail_record
+        WHERE 1=1
+        <if test="orderSn != null and orderSn.trim() != ''">
+            AND `order_sn` LIKE concat('%',#{orderSn},'%')
+        </if>
+    </select>
+
 </mapper>

kmall-admin/src/main/resources/mybatis/mapper/haikong/HaiKongMemberScoreChangeRecordDao.xml

@@ -136,4 +136,43 @@
         where out_biz_no = #{orderSn}
     </select>
 
+    <select id="queryListNew" resultType="com.kmall.admin.entity.haikong.HaiKongMemberScoreChangeRecordEntity">
+        select
+        `id`,
+        `open_id`,
+        `score`,
+        `out_biz_no`,
+        `change_reason`,
+        `change_event`,
+        `change_id`,
+        `statement_id`,
+        `create_time`,
+        `modify_time`,
+        `resend_status`
+        from haikong_member_score_change_record
+        WHERE 1=1
+        <if test="outBizNo != null and outBizNo.trim() != ''">
+            AND `out_biz_no` LIKE concat('%',#{outBizNo},'%')
+        </if>
+        <choose>
+            <when test="sidx != null and sidx.trim() != ''">
+                order by ${sidx} ${order}
+            </when>
+            <otherwise>
+                order by id desc
+            </otherwise>
+        </choose>
+        <if test="offset != null and limit != null">
+            limit #{offset}, #{limit}
+        </if>
+    </select>
+
+    <select id="queryTotalNew" resultType="int">
+        select count(*) from haikong_member_score_change_record
+        WHERE 1=1
+        <if test="outBizNo != null and outBizNo.trim() != ''">
+            AND `out_biz_no` LIKE concat('%',#{outBizNo},'%')
+        </if>
+    </select>
+
 </mapper>

kmall-admin/src/main/resources/mybatis/mapper/haikong/HaikongSendOrderInfoDetailRecordDao.xml

@@ -55,8 +55,11 @@
 			`tax_price`
 		from haikong_send_order_info_detail_record
 		WHERE 1=1
-		<if test="name != null and name.trim() != ''">
-			AND name LIKE concat('%',#{name},'%')
+		<if test="orderId != null and orderId.trim() != ''">
+			AND `order_id` LIKE concat('%',#{orderId},'%')
+		</if>
+		<if test="barcode != null and barcode.trim() != ''">
+			AND `barcode` LIKE concat('%',#{barcode},'%')
 		</if>
         <choose>
             <when test="sidx != null and sidx.trim() != ''">
@@ -96,9 +99,12 @@
  	<select id="queryTotal" resultType="int">
 		select count(*) from haikong_send_order_info_detail_record
 		WHERE 1=1
-        <if test="name != null and name.trim() != ''">
-            AND name LIKE concat('%',#{name},'%')
-        </if>
+		<if test="orderId != null and orderId.trim() != ''">
+			AND `order_id` LIKE concat('%',#{orderId},'%')
+		</if>
+		<if test="barcode != null and barcode.trim() != ''">
+			AND `barcode` LIKE concat('%',#{barcode},'%')
+		</if>
 	</select>
 	 
 	<insert id="save" parameterType="com.kmall.admin.entity.haikong.HaiKongSendOrderInfoDetailRecordEntity" useGeneratedKeys="true" keyProperty="id">

kmall-admin/src/main/resources/mybatis/mapper/haikong/HaikongSendOrderInfoRecordDao.xml

@@ -138,8 +138,8 @@
     		`resend_status`
 		from haikong_send_order_info_record
 		WHERE 1=1
-		<if test="name != null and name.trim() != ''">
-			AND name LIKE concat('%',#{name},'%')
+		<if test="outerOrderNo != null and outerOrderNo.trim() != ''">
+			AND `outer_order_no` LIKE concat('%',#{outerOrderNo},'%')
 		</if>
         <choose>
             <when test="sidx != null and sidx.trim() != ''">
@@ -192,9 +192,9 @@
  	<select id="queryTotal" resultType="int">
 		select count(*) from haikong_send_order_info_record
 		WHERE 1=1
-        <if test="name != null and name.trim() != ''">
-            AND name LIKE concat('%',#{name},'%')
-        </if>
+		<if test="outerOrderNo != null and outerOrderNo.trim() != ''">
+			AND `outer_order_no` LIKE concat('%',#{outerOrderNo},'%')
+		</if>
 	</select>
 	 
 	<insert id="save" parameterType="com.kmall.admin.entity.haikong.HaiKongSendOrderInfoRecordEntity" useGeneratedKeys="true" keyProperty="id">

kmall-admin/src/main/webapp/WEB-INF/page/haikong/haikongmemberordersyncresend.html

@@ -0,0 +1,78 @@
+<!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.orderNo" @on-enter="query" placeholder="订单编号"/>
+                </i-col>
+                <i-button @click="query">查询</i-button>
+                <i-button @click="reloadSearch">重置</i-button>
+            </div>
+            <div class="buttons-group">
+                #if($shiro.hasPermission("haikongmemberordersyncresend:save"))
+                <i-button type="info" @click="add"><i class="fa fa-plus"></i>&nbsp;新增</i-button>
+                #end
+                #if($shiro.hasPermission("haikongmemberordersyncresend:update"))
+                <i-button type="warning" @click="update"><i class="fa fa-pencil-square-o"></i>&nbsp;修改</i-button>
+                #end
+                #if($shiro.hasPermission("haikongmemberordersyncresend:delete"))
+                <i-button type="error" @click="del"><i class="fa fa-trash-o"></i>&nbsp;删除</i-button>
+                #end
+            </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="haikongMemberOrderSyncResend" :rules="ruleValidate" :label-width="80">
+            <Form-item label="海控会员系统会员唯一标识open_id" prop="openId">
+                <i-input v-model="haikongMemberOrderSyncResend.openId" placeholder="海控会员系统会员唯一标识open_id"/>
+            </Form-item>
+            <Form-item label="会员手机号，与open_id必传其一" prop="phone">
+                <i-input v-model="haikongMemberOrderSyncResend.phone" placeholder="会员手机号，与open_id必传其一"/>
+            </Form-item>
+            <Form-item label="消费时间" prop="consumeDate">
+                <i-input v-model="haikongMemberOrderSyncResend.consumeDate" placeholder="消费时间"/>
+            </Form-item>
+            <Form-item label="订单金额" prop="orderAmount">
+                <i-input v-model="haikongMemberOrderSyncResend.orderAmount" placeholder="订单金额"/>
+            </Form-item>
+            <Form-item label="订单编号" prop="orderNo">
+                <i-input v-model="haikongMemberOrderSyncResend.orderNo" placeholder="订单编号"/>
+            </Form-item>
+            <Form-item label="订单抵扣积分数量" prop="orderScore">
+                <i-input v-model="haikongMemberOrderSyncResend.orderScore" placeholder="订单抵扣积分数量"/>
+            </Form-item>
+            <Form-item label="会员系统订单id，请求成功返回" prop="memberSysOrderId">
+                <i-input v-model="haikongMemberOrderSyncResend.memberSysOrderId" placeholder="会员系统订单id，请求成功返回"/>
+            </Form-item>
+            <Form-item label="重发状态，0:等待重发 1:重发成功 2:重发失败 3:无需重发" prop="resendStatus">
+                <i-input v-model="haikongMemberOrderSyncResend.resendStatus" placeholder="重发状态，0:等待重发 1:重发成功 2:重发失败 3:无需重发"/>
+            </Form-item>
+            <Form-item label="最后一次重发时间" prop="lastResendTime">
+                <i-input v-model="haikongMemberOrderSyncResend.lastResendTime" placeholder="最后一次重发时间"/>
+            </Form-item>
+            <Form-item label="创建时间" prop="createTime">
+                <i-input v-model="haikongMemberOrderSyncResend.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/haikong/haikongmemberordersyncresend.js?_${date.systemTime}"></script>
+</body>
+</html>

kmall-admin/src/main/webapp/WEB-INF/page/haikong/haikongmemberscorechangedetailrecord.html

@@ -0,0 +1,84 @@
+<!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.orderSn" @on-enter="query" placeholder="订单编号"/>
+                </i-col>
+                <i-button @click="query">查询</i-button>
+                <i-button @click="reloadSearch">重置</i-button>
+            </div>
+            <div class="buttons-group">
+                #if($shiro.hasPermission("haikongmemberscorechangedetailrecord:save"))
+                <i-button type="info" @click="add"><i class="fa fa-plus"></i>&nbsp;新增</i-button>
+                #end
+                #if($shiro.hasPermission("haikongmemberscorechangedetailrecord:update"))
+                <i-button type="warning" @click="update"><i class="fa fa-pencil-square-o"></i>&nbsp;修改</i-button>
+                #end
+                #if($shiro.hasPermission("haikongmemberscorechangedetailrecord:delete"))
+                <i-button type="error" @click="del"><i class="fa fa-trash-o"></i>&nbsp;删除</i-button>
+                #end
+            </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="haikongMemberScoreChangeDetailRecord" :rules="ruleValidate" :label-width="80">
+            <Form-item label="订单编号" prop="orderSn">
+                <i-input v-model="haikongMemberScoreChangeDetailRecord.orderSn" placeholder="订单编号"/>
+            </Form-item>
+            <Form-item label="条码" prop="productBarcode">
+                <i-input v-model="haikongMemberScoreChangeDetailRecord.productBarcode" placeholder="条码"/>
+            </Form-item>
+            <Form-item label="sku" prop="sku">
+                <i-input v-model="haikongMemberScoreChangeDetailRecord.sku" placeholder="sku"/>
+            </Form-item>
+            <Form-item label="零售价" prop="retailPrice">
+                <i-input v-model="haikongMemberScoreChangeDetailRecord.retailPrice" placeholder="零售价"/>
+            </Form-item>
+            <Form-item label="实际支付价，该sku实际支付价格" prop="actualPrice">
+                <i-input v-model="haikongMemberScoreChangeDetailRecord.actualPrice" placeholder="实际支付价，该sku实际支付价格"/>
+            </Form-item>
+            <Form-item label="销售数" prop="sellVolume">
+                <i-input v-model="haikongMemberScoreChangeDetailRecord.sellVolume" placeholder="销售数"/>
+            </Form-item>
+            <Form-item label="分摊抵扣积分" prop="deductionScore">
+                <i-input v-model="haikongMemberScoreChangeDetailRecord.deductionScore" placeholder="分摊抵扣积分"/>
+            </Form-item>
+            <Form-item label="赠送积分" prop="giftScore">
+                <i-input v-model="haikongMemberScoreChangeDetailRecord.giftScore" placeholder="赠送积分"/>
+            </Form-item>
+            <Form-item label="生成规则：0:门店 1:分类 2:商品 3:无规则" prop="generateRules">
+                <i-input v-model="haikongMemberScoreChangeDetailRecord.generateRules" placeholder="生成规则：0:门店 1:分类 2:商品 3:无规则"/>
+            </Form-item>
+            <Form-item label="生成规则比例" prop="generateRatio">
+                <i-input v-model="haikongMemberScoreChangeDetailRecord.generateRatio" placeholder="生成规则比例"/>
+            </Form-item>
+            <Form-item label="创建时间" prop="createTime">
+                <i-input v-model="haikongMemberScoreChangeDetailRecord.createTime" placeholder="创建时间"/>
+            </Form-item>
+            <Form-item label="修改时间" prop="modifyTime">
+                <i-input v-model="haikongMemberScoreChangeDetailRecord.modifyTime" 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/haikong/haikongmemberscorechangedetailrecord.js?_${date.systemTime}"></script>
+</body>
+</html>

kmall-admin/src/main/webapp/WEB-INF/page/haikong/haikongmemberscorechangerecord.html

@@ -0,0 +1,78 @@
+<!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.outBizNo" @on-enter="query" placeholder="订单号"/>
+                </i-col>
+                <i-button @click="query">查询</i-button>
+                <i-button @click="reloadSearch">重置</i-button>
+            </div>
+            <div class="buttons-group">
+                #if($shiro.hasPermission("haikongmemberscorechangerecord:save"))
+                <i-button type="info" @click="add"><i class="fa fa-plus"></i>&nbsp;新增</i-button>
+                #end
+                #if($shiro.hasPermission("haikongmemberscorechangerecord:update"))
+                <i-button type="warning" @click="update"><i class="fa fa-pencil-square-o"></i>&nbsp;修改</i-button>
+                #end
+                #if($shiro.hasPermission("haikongmemberscorechangerecord:delete"))
+                <i-button type="error" @click="del"><i class="fa fa-trash-o"></i>&nbsp;删除</i-button>
+                #end
+            </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="haikongMemberScoreChangeRecord" :rules="ruleValidate" :label-width="80">
+            <Form-item label="openid" prop="openId">
+                <i-input v-model="haikongMemberScoreChangeRecord.openId" placeholder="openid"/>
+            </Form-item>
+            <Form-item label="会员积分 变动值，对应change_event在会员事件定义为非固定积分值事件时需要传该参数" prop="score">
+                <i-input v-model="haikongMemberScoreChangeRecord.score" placeholder="会员积分 变动值，对应change_event在会员事件定义为非固定积分值事件时需要传该参数"/>
+            </Form-item>
+            <Form-item label="订单号" prop="outBizNo">
+                <i-input v-model="haikongMemberScoreChangeRecord.outBizNo" placeholder="订单号"/>
+            </Form-item>
+            <Form-item label="积分变动描述" prop="changeReason">
+                <i-input v-model="haikongMemberScoreChangeRecord.changeReason" placeholder="积分变动描述"/>
+            </Form-item>
+            <Form-item label="积分变动事件，event_add/event_subtract(增/减)" prop="changeEvent">
+                <i-input v-model="haikongMemberScoreChangeRecord.changeEvent" placeholder="积分变动事件，event_add/event_subtract(增/减)"/>
+            </Form-item>
+            <Form-item label="自定义积分变动唯一标识" prop="changeId">
+                <i-input v-model="haikongMemberScoreChangeRecord.changeId" placeholder="自定义积分变动唯一标识"/>
+            </Form-item>
+            <Form-item label="积分变动流水id，请求成功后返回" prop="statementId">
+                <i-input v-model="haikongMemberScoreChangeRecord.statementId" placeholder="积分变动流水id，请求成功后返回"/>
+            </Form-item>
+            <Form-item label="" prop="createTime">
+                <i-input v-model="haikongMemberScoreChangeRecord.createTime" placeholder=""/>
+            </Form-item>
+            <Form-item label="" prop="modifyTime">
+                <i-input v-model="haikongMemberScoreChangeRecord.modifyTime" placeholder=""/>
+            </Form-item>
+            <Form-item label="重发状态，0:等待重发 1:重发成功 2:重发失败 3:无需重发" prop="resendStatus">
+                <i-input v-model="haikongMemberScoreChangeRecord.resendStatus" placeholder="重发状态，0:等待重发 1:重发成功 2:重发失败 3:无需重发"/>
+            </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/haikong/haikongmemberscorechangerecord.js?_${date.systemTime}"></script>
+</body>
+</html>

kmall-admin/src/main/webapp/WEB-INF/page/haikong/haikongsendorderinfodetailrecord.html

@@ -0,0 +1,87 @@
+<!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.orderId" @on-enter="query" placeholder="订单id"/>
+                </i-col>
+                <i-col span="4">
+                    <i-input v-model="q.barcode" @on-enter="query" placeholder="条码"/>
+                </i-col>
+                <i-button @click="query">查询</i-button>
+                <i-button @click="reloadSearch">重置</i-button>
+            </div>
+            <div class="buttons-group">
+                #if($shiro.hasPermission("haikongsendorderinfodetailrecord:save"))
+                <i-button type="info" @click="add"><i class="fa fa-plus"></i>&nbsp;新增</i-button>
+                #end
+                #if($shiro.hasPermission("haikongsendorderinfodetailrecord:update"))
+                <i-button type="warning" @click="update"><i class="fa fa-pencil-square-o"></i>&nbsp;修改</i-button>
+                #end
+                #if($shiro.hasPermission("haikongsendorderinfodetailrecord:delete"))
+                <i-button type="error" @click="del"><i class="fa fa-trash-o"></i>&nbsp;删除</i-button>
+                #end
+            </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="haikongSendOrderInfoDetailRecord" :rules="ruleValidate" :label-width="80">
+            <Form-item label="订单id" prop="orderId">
+                <i-input v-model="haikongSendOrderInfoDetailRecord.orderId" placeholder="订单id"/>
+            </Form-item>
+            <Form-item label="图片地址" prop="imageUrl">
+                <i-input v-model="haikongSendOrderInfoDetailRecord.imageUrl" placeholder="图片地址"/>
+            </Form-item>
+            <Form-item label="明细商品货号，填sku" prop="bn">
+                <i-input v-model="haikongSendOrderInfoDetailRecord.bn" placeholder="明细商品货号，填sku"/>
+            </Form-item>
+            <Form-item label="条码" prop="barcode">
+                <i-input v-model="haikongSendOrderInfoDetailRecord.barcode" placeholder="条码"/>
+            </Form-item>
+            <Form-item label="商品名" prop="name">
+                <i-input v-model="haikongSendOrderInfoDetailRecord.name" placeholder="商品名"/>
+            </Form-item>
+            <Form-item label="明细商品的成本，填零售价" prop="cost">
+                <i-input v-model="haikongSendOrderInfoDetailRecord.cost" placeholder="明细商品的成本，填零售价"/>
+            </Form-item>
+            <Form-item label="销售价" prop="price">
+                <i-input v-model="haikongSendOrderInfoDetailRecord.price" placeholder="销售价"/>
+            </Form-item>
+            <Form-item label="商品编码" prop="itemcode">
+                <i-input v-model="haikongSendOrderInfoDetailRecord.itemcode" placeholder="商品编码"/>
+            </Form-item>
+            <Form-item label="明细商品总额，销售价*数量" prop="amount">
+                <i-input v-model="haikongSendOrderInfoDetailRecord.amount" placeholder="明细商品总额，销售价*数量"/>
+            </Form-item>
+            <Form-item label="明细商品购买数量" prop="nums">
+                <i-input v-model="haikongSendOrderInfoDetailRecord.nums" placeholder="明细商品购买数量"/>
+            </Form-item>
+            <Form-item label="是否含税 固定传true" prop="isTax">
+                <i-input v-model="haikongSendOrderInfoDetailRecord.isTax" placeholder="是否含税 固定传true"/>
+            </Form-item>
+            <Form-item label="税金" prop="taxPrice">
+                <i-input v-model="haikongSendOrderInfoDetailRecord.taxPrice" 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/haikong/haikongsendorderinfodetailrecord.js?_${date.systemTime}"></script>
+</body>
+</html>

kmall-admin/src/main/webapp/WEB-INF/page/haikong/haikongsendorderinforecord.html

@@ -0,0 +1,132 @@
+<!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.outerOrderNo" @on-enter="query" placeholder="订单编号"/>
+                </i-col>
+                <i-button @click="query">查询</i-button>
+                <i-button @click="reloadSearch">重置</i-button>
+            </div>
+            <div class="buttons-group">
+                #if($shiro.hasPermission("haikongsendorderinforecord:save"))
+                <i-button type="info" @click="add"><i class="fa fa-plus"></i>&nbsp;新增</i-button>
+                #end
+                #if($shiro.hasPermission("haikongsendorderinforecord:update"))
+                <i-button type="warning" @click="update"><i class="fa fa-pencil-square-o"></i>&nbsp;修改</i-button>
+                #end
+                #if($shiro.hasPermission("haikongsendorderinforecord:delete"))
+                <i-button type="error" @click="del"><i class="fa fa-trash-o"></i>&nbsp;删除</i-button>
+                #end
+            </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="haikongSendOrderInfoRecord" :rules="ruleValidate" :label-width="80">
+            <Form-item label="订单编号" prop="outerOrderNo">
+                <i-input v-model="haikongSendOrderInfoRecord.outerOrderNo" placeholder="订单编号"/>
+            </Form-item>
+            <Form-item label="支付方式[wxpay|wxpayinapp|wxpayinwxapp|alipay|alipayguarantee|alipayqr|chinapay|chinapayclient|code|offine]" prop="payApp">
+                <i-input v-model="haikongSendOrderInfoRecord.payApp" placeholder="支付方式[wxpay|wxpayinapp|wxpayinwxapp|alipay|alipayguarantee|alipayqr|chinapay|chinapayclient|code|offine]"/>
+            </Form-item>
+            <Form-item label="配送方式，默认SF" prop="dlytypeCode">
+                <i-input v-model="haikongSendOrderInfoRecord.dlytypeCode" placeholder="配送方式，默认SF"/>
+            </Form-item>
+            <Form-item label="收货人" prop="consigneeName">
+                <i-input v-model="haikongSendOrderInfoRecord.consigneeName" placeholder="收货人"/>
+            </Form-item>
+            <Form-item label="收货地址省份" prop="consigneeAreaProvince">
+                <i-input v-model="haikongSendOrderInfoRecord.consigneeAreaProvince" placeholder="收货地址省份"/>
+            </Form-item>
+            <Form-item label="收货地址城市" prop="consigneeAreaCity">
+                <i-input v-model="haikongSendOrderInfoRecord.consigneeAreaCity" placeholder="收货地址城市"/>
+            </Form-item>
+            <Form-item label="收货地址地区" prop="consigneeAreaCounty">
+                <i-input v-model="haikongSendOrderInfoRecord.consigneeAreaCounty" placeholder="收货地址地区"/>
+            </Form-item>
+            <Form-item label="收货地址详细地址" prop="consigneeAddress">
+                <i-input v-model="haikongSendOrderInfoRecord.consigneeAddress" placeholder="收货地址详细地址"/>
+            </Form-item>
+            <Form-item label="收货人的邮编" prop="consigneeZip">
+                <i-input v-model="haikongSendOrderInfoRecord.consigneeZip" placeholder="收货人的邮编"/>
+            </Form-item>
+            <Form-item label="收货人的联系电话" prop="consigneeTel">
+                <i-input v-model="haikongSendOrderInfoRecord.consigneeTel" placeholder="收货人的联系电话"/>
+            </Form-item>
+            <Form-item label="收货人的邮箱" prop="consigneeEmail">
+                <i-input v-model="haikongSendOrderInfoRecord.consigneeEmail" placeholder="收货人的邮箱"/>
+            </Form-item>
+            <Form-item label="收货人的手机号" prop="consigneeMobile">
+                <i-input v-model="haikongSendOrderInfoRecord.consigneeMobile" placeholder="收货人的手机号"/>
+            </Form-item>
+            <Form-item label="订单商品总重量（克）" prop="weight">
+                <i-input v-model="haikongSendOrderInfoRecord.weight" placeholder="订单商品总重量（克）"/>
+            </Form-item>
+            <Form-item label="订单包含商品数量" prop="quantity">
+                <i-input v-model="haikongSendOrderInfoRecord.quantity" placeholder="订单包含商品数量"/>
+            </Form-item>
+            <Form-item label="订单应付总金额" prop="orderTotal">
+                <i-input v-model="haikongSendOrderInfoRecord.orderTotal" placeholder="订单应付总金额"/>
+            </Form-item>
+            <Form-item label="下单的平台，['pc','mobile','wx','ios','android','store','other']" prop="platform">
+                <i-input v-model="haikongSendOrderInfoRecord.platform" placeholder="下单的平台，['pc','mobile','wx','ios','android','store','other']"/>
+            </Form-item>
+            <Form-item label="支付货币金额" prop="money">
+                <i-input v-model="haikongSendOrderInfoRecord.money" placeholder="支付货币金额"/>
+            </Form-item>
+            <Form-item label="付款方式 online=在线支付 offline=线下支付 deposit=预付款支付" prop="payMode">
+                <i-input v-model="haikongSendOrderInfoRecord.payMode" placeholder="付款方式 online=在线支付 offline=线下支付 deposit=预付款支付"/>
+            </Form-item>
+            <Form-item label="发送给支付企业的原始请求" prop="request">
+                <i-input v-model="haikongSendOrderInfoRecord.request" placeholder="发送给支付企业的原始请求"/>
+            </Form-item>
+            <Form-item label="支付成功后回调的原始请求" prop="response">
+                <i-input v-model="haikongSendOrderInfoRecord.response" placeholder="支付成功后回调的原始请求"/>
+            </Form-item>
+            <Form-item label="支付平台流水号" prop="outTradeNo">
+                <i-input v-model="haikongSendOrderInfoRecord.outTradeNo" placeholder="支付平台流水号"/>
+            </Form-item>
+            <Form-item label="口岸代码  4600" prop="seaportCode">
+                <i-input v-model="haikongSendOrderInfoRecord.seaportCode" placeholder="口岸代码  4600"/>
+            </Form-item>
+            <Form-item label="跨境商品平台来源 1:广州跨境通保税 2:自营保税    填1" prop="seaportPlatform">
+                <i-input v-model="haikongSendOrderInfoRecord.seaportPlatform" placeholder="跨境商品平台来源 1:广州跨境通保税 2:自营保税    填1"/>
+            </Form-item>
+            <Form-item label="订购人身份证号码" prop="identityCard">
+                <i-input v-model="haikongSendOrderInfoRecord.identityCard" placeholder="订购人身份证号码"/>
+            </Form-item>
+            <Form-item label="订购人姓名" prop="identityName">
+                <i-input v-model="haikongSendOrderInfoRecord.identityName" placeholder="订购人姓名"/>
+            </Form-item>
+            <Form-item label="订购人手机号" prop="identityMobile">
+                <i-input v-model="haikongSendOrderInfoRecord.identityMobile" placeholder="订购人手机号"/>
+            </Form-item>
+            <Form-item label="订单产品信息，json字符串" prop="orderProductInfo">
+                <i-input v-model="haikongSendOrderInfoRecord.orderProductInfo" placeholder="订单产品信息，json字符串"/>
+            </Form-item>
+            <Form-item label="重发状态，0:等待重发 1:重发成功 2:重发失败 3:无需重发" prop="resendStatus">
+                <i-input v-model="haikongSendOrderInfoRecord.resendStatus" placeholder="重发状态，0:等待重发 1:重发成功 2:重发失败 3:无需重发"/>
+            </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/haikong/haikongsendorderinforecord.js?_${date.systemTime}"></script>
+</body>
+</html>

kmall-admin/src/main/webapp/js/haikong/haikongmemberordersyncresend.js

@@ -0,0 +1,170 @@
+$(function () {
+    $("#jqGrid").jqGrid({
+        url: '../haikongmemberordersyncresend/list',
+        datatype: "json",
+        colModel: [
+			{label: 'id', name: 'id', index: 'id', key: true, hidden: true},
+			{label: '海控会员系统会员唯一标识open_id', name: 'openId', index: 'open_id', width: 100},
+			{label: '会员手机号', name: 'phone', index: 'phone', width: 100},
+			{
+				label: '消费时间', name: 'consumeDate', index: 'consume_date', width: 100,
+				formatter: function (value) {
+					return transDate(value, 'yyyy-MM-dd hh:mm:ss')
+				}
+			},
+			{label: '订单金额', name: 'orderAmount', index: 'order_amount', width: 100},
+			{label: '订单编号', name: 'orderNo', index: 'order_no', width: 100},
+			{label: '订单抵扣积分数量', name: 'orderScore', index: 'order_score', width: 100},
+			{label: '会员系统订单id', name: 'memberSysOrderId', index: 'member_sys_order_id', width: 100},
+			{label: '重发状态', name: 'resendStatus', index: 'resend_status', width: 100,
+				formatter: function (value) {
+					if (value == '0') {
+						return '等待重发';
+					} else if (value == '1') {
+						return '重发成功';
+					} else if (value == '2') {
+						return '重发失败';
+					} else if (value == '3') {
+						return '无需重发';
+					}
+				}
+			},
+			{label: '最后一次重发时间', name: 'lastResendTime', index: 'last_resend_time', width: 100,
+				formatter: function (value) {
+					return transDate(value, 'yyyy-MM-dd hh:mm:ss')
+				}
+			}
+			],
+		viewrecords: true,
+        height: 550,
+        rowNum: 10,
+        rowList: [10, 30, 50],
+        rownumbers: true,
+        rownumWidth: 25,
+        autowidth: true,
+        multiselect: true,
+		shrinkToFit: false,
+        pager: "#jqGridPager",
+        jsonReader: {
+            root: "page.list",
+            page: "page.currPage",
+            total: "page.totalPage",
+            records: "page.totalCount"
+        },
+        prmNames: {
+            page: "page",
+            rows: "limit",
+            order: "order"
+        },
+        gridComplete: function () {
+
+        }
+    });
+});
+
+let vm = new Vue({
+	el: '#rrapp',
+	data: {
+        showList: true,
+        title: null,
+		haikongMemberOrderSyncResend: {},
+		ruleValidate: {
+			name: [
+				{required: true, message: '名称不能为空', trigger: 'blur'}
+			]
+		},
+		q: {
+			orderNo: ''
+		}
+	},
+	methods: {
+		query: function () {
+			vm.reload();
+		},
+		add: function () {
+			vm.showList = false;
+			vm.title = "新增";
+			vm.haikongMemberOrderSyncResend = {};
+		},
+		update: function (event) {
+            let id = getSelectedRow();
+			if (id == null) {
+				return;
+			}
+			vm.showList = false;
+            vm.title = "修改";
+
+            vm.getInfo(id)
+		},
+		saveOrUpdate: function (event) {
+            let url = vm.haikongMemberOrderSyncResend.id == null ? "../haikongmemberordersyncresend/save" : "../haikongmemberordersyncresend/update";
+			$.ajax({
+				type: "POST",
+			    url: url,
+			    contentType: "application/json",
+			    data: JSON.stringify(vm.haikongMemberOrderSyncResend),
+                success: function (r) {
+                    if (r.code === 0) {
+                        alert('操作成功', function (index) {
+                            vm.reload();
+                        });
+                    } else {
+                        alert(r.msg);
+                    }
+                }
+			});
+		},
+		del: function (event) {
+            let ids = getSelectedRows();
+			if (ids == null){
+				return;
+			}
+
+			confirm('确定要删除选中的记录？', function () {
+				$.ajax({
+					type: "POST",
+				    url: "../haikongmemberordersyncresend/delete",
+				    contentType: "application/json",
+				    data: JSON.stringify(ids),
+				    success: function (r) {
+						if (r.code == 0) {
+							alert('操作成功', function (index) {
+								$("#jqGrid").trigger("reloadGrid");
+							});
+						} else {
+							alert(r.msg);
+						}
+					}
+				});
+			});
+		},
+		getInfo: function(id){
+			$.get("../haikongmemberordersyncresend/info/"+id, function (r) {
+                vm.haikongMemberOrderSyncResend = r.haikongMemberOrderSyncResend;
+            });
+		},
+        reloadSearch: function() {
+            vm.q = {
+				orderNo: ''
+            }
+            vm.reload();
+		},
+		reload: function (event) {
+			vm.showList = true;
+            let page = $("#jqGrid").jqGrid('getGridParam', 'page');
+			$("#jqGrid").jqGrid('setGridParam', {
+                postData: {'orderNo': vm.q.orderNo},
+                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/haikong/haikongmemberscorechangedetailrecord.js

@@ -0,0 +1,161 @@
+$(function () {
+    $("#jqGrid").jqGrid({
+        url: '../haikongmemberscorechangedetailrecord/list',
+        datatype: "json",
+        colModel: [
+			{label: 'id', name: 'id', index: 'id', key: true, hidden: true},
+			{label: '订单编号', name: 'orderSn', index: 'order_sn', width: 100},
+			{label: '条码', name: 'productBarcode', index: 'product_barcode', width: 100},
+			{label: 'sku', name: 'sku', index: 'sku', width: 100},
+			{label: '零售价', name: 'retailPrice', index: 'retail_price', width: 100},
+			{label: '实际支付价', name: 'actualPrice', index: 'actual_price', width: 100},
+			{label: '销售数', name: 'sellVolume', index: 'sell_volume', width: 100},
+			{label: '分摊抵扣积分', name: 'deductionScore', index: 'deduction_score', width: 100},
+			{label: '赠送积分', name: 'giftScore', index: 'gift_score', width: 100},
+			{label: '生成规则', name: 'generateRules', index: 'generate_rules', width: 100,
+				formatter: function (value) {
+					if (value == '0') {
+						return '门店';
+					} else if (value == '1') {
+						return '分类';
+					} else if (value == '2') {
+						return '商品';
+					} else if (value == '3') {
+						return '无规则';
+					}
+				}
+			},
+			{label: '生成规则比例', name: 'generateRatio', index: 'generate_ratio', width: 100}
+			],
+		viewrecords: true,
+        height: 550,
+        rowNum: 10,
+        rowList: [10, 30, 50],
+        rownumbers: true,
+        rownumWidth: 25,
+        autowidth: true,
+        multiselect: true,
+		shrinkToFit: false,
+        pager: "#jqGridPager",
+        jsonReader: {
+            root: "page.list",
+            page: "page.currPage",
+            total: "page.totalPage",
+            records: "page.totalCount"
+        },
+        prmNames: {
+            page: "page",
+            rows: "limit",
+            order: "order"
+        },
+        gridComplete: function () {
+        }
+    });
+});
+
+let vm = new Vue({
+	el: '#rrapp',
+	data: {
+        showList: true,
+        title: null,
+		haikongMemberScoreChangeDetailRecord: {},
+		ruleValidate: {
+			name: [
+				{required: true, message: '名称不能为空', trigger: 'blur'}
+			]
+		},
+		q: {
+			orderSn: ''
+		}
+	},
+	methods: {
+		query: function () {
+			vm.reload();
+		},
+		add: function () {
+			vm.showList = false;
+			vm.title = "新增";
+			vm.haikongMemberScoreChangeDetailRecord = {};
+		},
+		update: function (event) {
+            let id = getSelectedRow();
+			if (id == null) {
+				return;
+			}
+			vm.showList = false;
+            vm.title = "修改";
+
+            vm.getInfo(id)
+		},
+		saveOrUpdate: function (event) {
+            let url = vm.haikongMemberScoreChangeDetailRecord.id == null ? "../haikongmemberscorechangedetailrecord/save" : "../haikongmemberscorechangedetailrecord/update";
+			$.ajax({
+				type: "POST",
+			    url: url,
+			    contentType: "application/json",
+			    data: JSON.stringify(vm.haikongMemberScoreChangeDetailRecord),
+                success: function (r) {
+                    if (r.code === 0) {
+                        alert('操作成功', function (index) {
+                            vm.reload();
+                        });
+                    } else {
+                        alert(r.msg);
+                    }
+                }
+			});
+		},
+		del: function (event) {
+            let ids = getSelectedRows();
+			if (ids == null){
+				return;
+			}
+
+			confirm('确定要删除选中的记录？', function () {
+				$.ajax({
+					type: "POST",
+				    url: "../haikongmemberscorechangedetailrecord/delete",
+				    contentType: "application/json",
+				    data: JSON.stringify(ids),
+				    success: function (r) {
+						if (r.code == 0) {
+							alert('操作成功', function (index) {
+								$("#jqGrid").trigger("reloadGrid");
+							});
+						} else {
+							alert(r.msg);
+						}
+					}
+				});
+			});
+		},
+		getInfo: function(id){
+			$.get("../haikongmemberscorechangedetailrecord/info/"+id, function (r) {
+                vm.haikongMemberScoreChangeDetailRecord = r.haikongMemberScoreChangeDetailRecord;
+            });
+		},
+        reloadSearch: function() {
+            vm.q = {
+				orderSn: ''
+            }
+            vm.reload();
+		},
+		reload: function (event) {
+			vm.showList = true;
+            let page = $("#jqGrid").jqGrid('getGridParam', 'page');
+			$("#jqGrid").jqGrid('setGridParam', {
+                postData: {'orderSn': vm.q.orderSn},
+                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/haikong/haikongmemberscorechangerecord.js

@@ -0,0 +1,159 @@
+$(function () {
+    $("#jqGrid").jqGrid({
+        url: '../haikongmemberscorechangerecord/list',
+        datatype: "json",
+        colModel: [
+			{label: 'id', name: 'id', index: 'id', key: true, hidden: true},
+			{label: 'openid', name: 'openId', index: 'open_id', width: 100},
+			{label: '会员积分', name: 'score', index: 'score', width: 100},
+			{label: '订单号', name: 'outBizNo', index: 'out_biz_no', width: 100},
+			{label: '积分变动描述', name: 'changeReason', index: 'change_reason', width: 100},
+			{label: '积分变动事件', name: 'changeEvent', index: 'change_event', width: 100},
+			{label: '自定义积分变动唯一标识', name: 'changeId', index: 'change_id', width: 100},
+			{label: '积分变动流水id', name: 'statementId', index: 'statement_id', width: 100},
+			{label: '重发状态', name: 'resendStatus', index: 'resend_status', width: 100,
+				formatter: function (value) {
+					if (value == '0') {
+						return '等待重发';
+					} else if (value == '1') {
+						return '重发成功';
+					} else if (value == '2') {
+						return '重发失败';
+					} else if (value == '3') {
+						return '无需重发';
+					}
+				}
+			}],
+		viewrecords: true,
+        height: 550,
+        rowNum: 10,
+        rowList: [10, 30, 50],
+        rownumbers: true,
+        rownumWidth: 25,
+        autowidth: true,
+        multiselect: true,
+		shrinkToFit: false,
+        pager: "#jqGridPager",
+        jsonReader: {
+            root: "page.list",
+            page: "page.currPage",
+            total: "page.totalPage",
+            records: "page.totalCount"
+        },
+        prmNames: {
+            page: "page",
+            rows: "limit",
+            order: "order"
+        },
+        gridComplete: function () {
+
+        }
+    });
+});
+
+let vm = new Vue({
+	el: '#rrapp',
+	data: {
+        showList: true,
+        title: null,
+		haikongMemberScoreChangeRecord: {},
+		ruleValidate: {
+			name: [
+				{required: true, message: '名称不能为空', trigger: 'blur'}
+			]
+		},
+		q: {
+			outBizNo: ''
+		}
+	},
+	methods: {
+		query: function () {
+			vm.reload();
+		},
+		add: function () {
+			vm.showList = false;
+			vm.title = "新增";
+			vm.haikongMemberScoreChangeRecord = {};
+		},
+		update: function (event) {
+            let id = getSelectedRow();
+			if (id == null) {
+				return;
+			}
+			vm.showList = false;
+            vm.title = "修改";
+
+            vm.getInfo(id)
+		},
+		saveOrUpdate: function (event) {
+            let url = vm.haikongMemberScoreChangeRecord.id == null ? "../haikongmemberscorechangerecord/save" : "../haikongmemberscorechangerecord/update";
+			$.ajax({
+				type: "POST",
+			    url: url,
+			    contentType: "application/json",
+			    data: JSON.stringify(vm.haikongMemberScoreChangeRecord),
+                success: function (r) {
+                    if (r.code === 0) {
+                        alert('操作成功', function (index) {
+                            vm.reload();
+                        });
+                    } else {
+                        alert(r.msg);
+                    }
+                }
+			});
+		},
+		del: function (event) {
+            let ids = getSelectedRows();
+			if (ids == null){
+				return;
+			}
+
+			confirm('确定要删除选中的记录？', function () {
+				$.ajax({
+					type: "POST",
+				    url: "../haikongmemberscorechangerecord/delete",
+				    contentType: "application/json",
+				    data: JSON.stringify(ids),
+				    success: function (r) {
+						if (r.code == 0) {
+							alert('操作成功', function (index) {
+								$("#jqGrid").trigger("reloadGrid");
+							});
+						} else {
+							alert(r.msg);
+						}
+					}
+				});
+			});
+		},
+		getInfo: function(id){
+			$.get("../haikongmemberscorechangerecord/info/"+id, function (r) {
+                vm.haikongMemberScoreChangeRecord = r.haikongMemberScoreChangeRecord;
+            });
+		},
+        reloadSearch: function() {
+            vm.q = {
+				outBizNo: ''
+            }
+            vm.reload();
+		},
+		reload: function (event) {
+			vm.showList = true;
+            let page = $("#jqGrid").jqGrid('getGridParam', 'page');
+			$("#jqGrid").jqGrid('setGridParam', {
+                postData: {'outBizNo': vm.q.outBizNo},
+                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/haikong/haikongsendorderinfodetailrecord.js

@@ -0,0 +1,152 @@
+$(function () {
+    $("#jqGrid").jqGrid({
+        url: '../haikongsendorderinfodetailrecord/list',
+        datatype: "json",
+        colModel: [
+			{label: 'id', name: 'id', index: 'id', key: true, hidden: true},
+			{label: '订单id', name: 'orderId', index: 'order_id', width: 80},
+			{label: '图片地址', name: 'imageUrl', index: 'image_url', width: 80},
+			{label: '明细商品货号', name: 'bn', index: 'bn', width: 80},
+			{label: '条码', name: 'barcode', index: 'barcode', width: 80},
+			{label: '商品名', name: 'name', index: 'name', width: 80},
+			{label: '明细商品的成本', name: 'cost', index: 'cost', width: 80},
+			{label: '销售价', name: 'price', index: 'price', width: 80},
+			{label: '商品编码', name: 'itemcode', index: 'itemcode', width: 80},
+			{label: '明细商品总额', name: 'amount', index: 'amount', width: 80},
+			{label: '明细商品购买数量', name: 'nums', index: 'nums', width: 80},
+			{label: '是否含税', name: 'isTax', index: 'is_tax', width: 80},
+			{label: '税金', name: 'taxPrice', index: 'tax_price', width: 80}],
+		viewrecords: true,
+        height: 550,
+        rowNum: 10,
+        rowList: [10, 30, 50],
+        rownumbers: true,
+        rownumWidth: 25,
+        autowidth: true,
+        multiselect: true,
+		shrinkToFit: false,
+        pager: "#jqGridPager",
+        jsonReader: {
+            root: "page.list",
+            page: "page.currPage",
+            total: "page.totalPage",
+            records: "page.totalCount"
+        },
+        prmNames: {
+            page: "page",
+            rows: "limit",
+            order: "order"
+        },
+        gridComplete: function () {
+        }
+    });
+});
+
+let vm = new Vue({
+	el: '#rrapp',
+	data: {
+        showList: true,
+        title: null,
+		haikongSendOrderInfoDetailRecord: {},
+		ruleValidate: {
+			name: [
+				{required: true, message: '名称不能为空', trigger: 'blur'}
+			]
+		},
+		q: {
+		    orderId: '',
+			barcode: ''
+		}
+	},
+	methods: {
+		query: function () {
+			vm.reload();
+		},
+		add: function () {
+			vm.showList = false;
+			vm.title = "新增";
+			vm.haikongSendOrderInfoDetailRecord = {};
+		},
+		update: function (event) {
+            let id = getSelectedRow();
+			if (id == null) {
+				return;
+			}
+			vm.showList = false;
+            vm.title = "修改";
+
+            vm.getInfo(id)
+		},
+		saveOrUpdate: function (event) {
+            let url = vm.haikongSendOrderInfoDetailRecord.id == null ? "../haikongsendorderinfodetailrecord/save" : "../haikongsendorderinfodetailrecord/update";
+			$.ajax({
+				type: "POST",
+			    url: url,
+			    contentType: "application/json",
+			    data: JSON.stringify(vm.haikongSendOrderInfoDetailRecord),
+                success: function (r) {
+                    if (r.code === 0) {
+                        alert('操作成功', function (index) {
+                            vm.reload();
+                        });
+                    } else {
+                        alert(r.msg);
+                    }
+                }
+			});
+		},
+		del: function (event) {
+            let ids = getSelectedRows();
+			if (ids == null){
+				return;
+			}
+
+			confirm('确定要删除选中的记录？', function () {
+				$.ajax({
+					type: "POST",
+				    url: "../haikongsendorderinfodetailrecord/delete",
+				    contentType: "application/json",
+				    data: JSON.stringify(ids),
+				    success: function (r) {
+						if (r.code == 0) {
+							alert('操作成功', function (index) {
+								$("#jqGrid").trigger("reloadGrid");
+							});
+						} else {
+							alert(r.msg);
+						}
+					}
+				});
+			});
+		},
+		getInfo: function(id){
+			$.get("../haikongsendorderinfodetailrecord/info/"+id, function (r) {
+                vm.haikongSendOrderInfoDetailRecord = r.haikongSendOrderInfoDetailRecord;
+            });
+		},
+        reloadSearch: function() {
+            vm.q = {
+                orderId: '',
+				barcode: ''
+            }
+            vm.reload();
+		},
+		reload: function (event) {
+			vm.showList = true;
+            let page = $("#jqGrid").jqGrid('getGridParam', 'page');
+			$("#jqGrid").jqGrid('setGridParam', {
+                postData: {'barcode': vm.q.barcode, 'orderId': vm.q.orderId},
+                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/haikong/haikongsendorderinforecord.js

@@ -0,0 +1,197 @@
+$(function () {
+    $("#jqGrid").jqGrid({
+        url: '../haikongsendorderinforecord/list',
+        datatype: "json",
+        colModel: [
+			{label: 'id', name: 'id', index: 'id', key: true, hidden: true},
+			{label: '订单编号', name: 'outerOrderNo', index: 'outer_order_no', width: 80},
+			{label: '支付方式', name: 'payApp', index: 'pay_app', width: 80},
+			{label: '配送方式', name: 'dlytypeCode', index: 'dlytype_code', width: 80},
+			{label: '收货人', name: 'consigneeName', index: 'consignee_name', width: 80},
+			{label: '收货地址省份', name: 'consigneeAreaProvince', index: 'consignee_area_province', width: 80},
+			{label: '收货地址城市', name: 'consigneeAreaCity', index: 'consignee_area_city', width: 80},
+			{label: '收货地址地区', name: 'consigneeAreaCounty', index: 'consignee_area_county', width: 80},
+			{label: '收货地址详细地址', name: 'consigneeAddress', index: 'consignee_address', width: 80},
+			{label: '收货人的邮编', name: 'consigneeZip', index: 'consignee_zip', width: 80},
+			{label: '收货人的联系电话', name: 'consigneeTel', index: 'consignee_tel', width: 80},
+			{label: '收货人的邮箱', name: 'consigneeEmail', index: 'consignee_email', width: 80},
+			{label: '收货人的手机号', name: 'consigneeMobile', index: 'consignee_mobile', width: 80},
+			{label: '订单商品总重量（克）', name: 'weight', index: 'weight', width: 80},
+			{label: '订单包含商品数量', name: 'quantity', index: 'quantity', width: 80},
+			{label: '订单应付总金额', name: 'orderTotal', index: 'order_total', width: 80},
+			{label: '下单的平台', name: 'platform', index: 'platform', width: 80},
+			{label: '支付货币金额', name: 'money', index: 'money', width: 80},
+			{label: '付款方式', name: 'payMode', index: 'pay_mode', width: 80,
+				formatter: function (value) {
+					if (value == 'online') {
+						return '在线支付';
+					} else if (value == 'offline') {
+						return '线下支付';
+					} else if (value == 'deposit') {
+						return '预付款支付';
+					}
+				}
+			},
+			{label: '发送给支付企业的原始请求', name: 'request', index: 'request', width: 80},
+			{label: '支付成功后回调的原始请求', name: 'response', index: 'response', width: 80},
+			{label: '支付平台流水号', name: 'outTradeNo', index: 'out_trade_no', width: 80},
+			{label: '口岸代码', name: 'seaportCode', index: 'seaport_code', width: 80},
+			{label: '跨境商品平台来源', name: 'seaportPlatform', index: 'seaport_platform', width: 80,
+				formatter: function (value) {
+					if (value == '1') {
+						return '广州跨境通保税';
+					} else if (value == '2') {
+						return '自营保税';
+					}
+				}
+			},
+			{label: '订购人身份证号码', name: 'identityCard', index: 'identity_card', width: 80},
+			{label: '订购人姓名', name: 'identityName', index: 'identity_name', width: 80},
+			{label: '订购人手机号', name: 'identityMobile', index: 'identity_mobile', width: 80},
+			{label: '订单产品信息', name: 'orderProductInfo', index: 'order_product_info', width: 80},
+			{label: '重发状态', name: 'resendStatus', index: 'resend_status', width: 80,
+				formatter: function (value) {
+					if (value == '0') {
+						return '等待重发';
+					} else if (value == '1') {
+						return '重发成功';
+					} else if (value == '2') {
+						return '重发失败';
+					} else if (value == '3') {
+						return '无需重发';
+					}
+				}
+			}],
+		viewrecords: true,
+        height: 550,
+        rowNum: 10,
+        rowList: [10, 30, 50],
+        rownumbers: true,
+        rownumWidth: 25,
+		autowidth: true,
+        multiselect: true,
+		shrinkToFit: false,
+        pager: "#jqGridPager",
+        jsonReader: {
+            root: "page.list",
+            page: "page.currPage",
+            total: "page.totalPage",
+            records: "page.totalCount"
+        },
+        prmNames: {
+            page: "page",
+            rows: "limit",
+            order: "order"
+        },
+        gridComplete: function () {
+
+        }
+    });
+});
+
+let vm = new Vue({
+	el: '#rrapp',
+	data: {
+        showList: true,
+        title: null,
+		haikongSendOrderInfoRecord: {},
+		ruleValidate: {
+			name: [
+				{required: true, message: '名称不能为空', trigger: 'blur'}
+			]
+		},
+		q: {
+			outerOrderNo: ''
+		}
+	},
+	methods: {
+		query: function () {
+			vm.reload();
+		},
+		add: function () {
+			vm.showList = false;
+			vm.title = "新增";
+			vm.haikongSendOrderInfoRecord = {};
+		},
+		update: function (event) {
+            let id = getSelectedRow();
+			if (id == null) {
+				return;
+			}
+			vm.showList = false;
+            vm.title = "修改";
+
+            vm.getInfo(id)
+		},
+		saveOrUpdate: function (event) {
+            let url = vm.haikongSendOrderInfoRecord.id == null ? "../haikongsendorderinforecord/save" : "../haikongsendorderinforecord/update";
+			$.ajax({
+				type: "POST",
+			    url: url,
+			    contentType: "application/json",
+			    data: JSON.stringify(vm.haikongSendOrderInfoRecord),
+                success: function (r) {
+                    if (r.code === 0) {
+                        alert('操作成功', function (index) {
+                            vm.reload();
+                        });
+                    } else {
+                        alert(r.msg);
+                    }
+                }
+			});
+		},
+		del: function (event) {
+            let ids = getSelectedRows();
+			if (ids == null){
+				return;
+			}
+
+			confirm('确定要删除选中的记录？', function () {
+				$.ajax({
+					type: "POST",
+				    url: "../haikongsendorderinforecord/delete",
+				    contentType: "application/json",
+				    data: JSON.stringify(ids),
+				    success: function (r) {
+						if (r.code == 0) {
+							alert('操作成功', function (index) {
+								$("#jqGrid").trigger("reloadGrid");
+							});
+						} else {
+							alert(r.msg);
+						}
+					}
+				});
+			});
+		},
+		getInfo: function(id){
+			$.get("../haikongsendorderinforecord/info/"+id, function (r) {
+                vm.haikongSendOrderInfoRecord = r.haikongSendOrderInfoRecord;
+            });
+		},
+        reloadSearch: function() {
+            vm.q = {
+				outerOrderNo: ''
+            }
+            vm.reload();
+		},
+		reload: function (event) {
+			vm.showList = true;
+            let page = $("#jqGrid").jqGrid('getGridParam', 'page');
+			$("#jqGrid").jqGrid('setGridParam', {
+                postData: {'outerOrderNo': vm.q.outerOrderNo},
+                page: page
+            }).trigger("reloadGrid");
+            vm.handleReset('formValidate');
+		},
+        handleSubmit: function (name) {
+            handleSubmitValidate(this, name, function () {
+                vm.saveOrUpdate()
+            });
+        },
+        handleReset: function (name) {
+            handleResetForm(this, name);
+        }
+	}
+});