多条退款查询定时任务修改，以及国别代码、计量参数代码修改

kmall-admin/src/main/java/com/kmall/admin/controller/OrderController.java

@@ -257,6 +257,7 @@ public class OrderController {
                 orderRefund.setRefundMoney(BigDecimal.valueOf(orderInfo.getActualPrice().doubleValue()));
                 orderRefund.setRefundStatus(Integer.parseInt(Dict.RefundStatus.item_4.getItem()));
                 orderRefund.setModTime(new Date());
+                orderRefund.setOutRefundNo(result.getOut_refund_no());
                 if(mallOrderRefund !=null){
                     orderRefund.setId(mallOrderRefund.getId());
                     orderRefundService.update(orderRefund);//退款记录

kmall-admin/src/main/java/com/kmall/admin/controller/SysCusNationCodeController.java

@@ -0,0 +1,106 @@
+package com.kmall.admin.controller;
+
+import java.util.List;
+import java.util.Map;
+
+import com.kmall.admin.entity.SysCusNationCodeEntity;
+import com.kmall.admin.service.SysCusNationCodeService;
+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 2018-11-10 15:26:44
+ */
+@Controller
+@RequestMapping("syscusnationcode")
+public class SysCusNationCodeController {
+    @Autowired
+    private SysCusNationCodeService sysCusNationCodeService;
+
+    /**
+     * 查看列表
+     */
+    @RequestMapping("/list")
+    @RequiresPermissions("syscusnationcode:list")
+    @ResponseBody
+    public R list(@RequestParam Map<String, Object> params) {
+        //查询列表数据
+        Query query = new Query(params);
+
+        List<SysCusNationCodeEntity> sysCusNationCodeList = sysCusNationCodeService.queryList(query);
+        int total = sysCusNationCodeService.queryTotal(query);
+
+        PageUtils pageUtil = new PageUtils(sysCusNationCodeList, total, query.getLimit(), query.getPage());
+
+        return R.ok().put("page", pageUtil);
+    }
+
+    /**
+     * 查看信息
+     */
+    @RequestMapping("/info/{sn}")
+    @RequiresPermissions("syscusnationcode:info")
+    @ResponseBody
+    public R info(@PathVariable("sn") String sn) {
+        SysCusNationCodeEntity sysCusNationCode = sysCusNationCodeService.queryObject(sn);
+
+        return R.ok().put("sysCusNationCode", sysCusNationCode);
+    }
+
+    /**
+     * 保存
+     */
+    @RequestMapping("/save")
+    @RequiresPermissions("syscusnationcode:save")
+    @ResponseBody
+    public R save(@RequestBody SysCusNationCodeEntity sysCusNationCode) {
+        sysCusNationCodeService.save(sysCusNationCode);
+
+        return R.ok();
+    }
+
+    /**
+     * 修改
+     */
+    @RequestMapping("/update")
+    @RequiresPermissions("syscusnationcode:update")
+    @ResponseBody
+    public R update(@RequestBody SysCusNationCodeEntity sysCusNationCode) {
+        sysCusNationCodeService.update(sysCusNationCode);
+
+        return R.ok();
+    }
+
+    /**
+     * 删除
+     */
+    @RequestMapping("/delete")
+    @RequiresPermissions("syscusnationcode:delete")
+    @ResponseBody
+    public R delete(@RequestBody String[]sns) {
+        sysCusNationCodeService.deleteBatch(sns);
+
+        return R.ok();
+    }
+
+    /**
+     * 查看所有列表
+     */
+    @RequestMapping("/queryAll")
+    @ResponseBody
+    public R queryAll(@RequestParam Map<String, Object> params) {
+
+        List<SysCusNationCodeEntity> list = sysCusNationCodeService.queryList(params);
+
+        return R.ok().put("list", list);
+    }
+}

kmall-admin/src/main/java/com/kmall/admin/controller/SysCusUnitCodeController.java

@@ -0,0 +1,106 @@
+package com.kmall.admin.controller;
+
+import java.util.List;
+import java.util.Map;
+
+import com.kmall.admin.entity.SysCusUnitCodeEntity;
+import com.kmall.admin.service.SysCusUnitCodeService;
+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 2018-11-10 15:34:36
+ */
+@Controller
+@RequestMapping("syscusunitcode")
+public class SysCusUnitCodeController {
+    @Autowired
+    private SysCusUnitCodeService sysCusUnitCodeService;
+
+    /**
+     * 查看列表
+     */
+    @RequestMapping("/list")
+    @RequiresPermissions("syscusunitcode:list")
+    @ResponseBody
+    public R list(@RequestParam Map<String, Object> params) {
+        //查询列表数据
+        Query query = new Query(params);
+
+        List<SysCusUnitCodeEntity> sysCusUnitCodeList = sysCusUnitCodeService.queryList(query);
+        int total = sysCusUnitCodeService.queryTotal(query);
+
+        PageUtils pageUtil = new PageUtils(sysCusUnitCodeList, total, query.getLimit(), query.getPage());
+
+        return R.ok().put("page", pageUtil);
+    }
+
+    /**
+     * 查看信息
+     */
+    @RequestMapping("/info/{sn}")
+    @RequiresPermissions("syscusunitcode:info")
+    @ResponseBody
+    public R info(@PathVariable("sn") String sn) {
+        SysCusUnitCodeEntity sysCusUnitCode = sysCusUnitCodeService.queryObject(sn);
+
+        return R.ok().put("sysCusUnitCode", sysCusUnitCode);
+    }
+
+    /**
+     * 保存
+     */
+    @RequestMapping("/save")
+    @RequiresPermissions("syscusunitcode:save")
+    @ResponseBody
+    public R save(@RequestBody SysCusUnitCodeEntity sysCusUnitCode) {
+        sysCusUnitCodeService.save(sysCusUnitCode);
+
+        return R.ok();
+    }
+
+    /**
+     * 修改
+     */
+    @RequestMapping("/update")
+    @RequiresPermissions("syscusunitcode:update")
+    @ResponseBody
+    public R update(@RequestBody SysCusUnitCodeEntity sysCusUnitCode) {
+        sysCusUnitCodeService.update(sysCusUnitCode);
+
+        return R.ok();
+    }
+
+    /**
+     * 删除
+     */
+    @RequestMapping("/delete")
+    @RequiresPermissions("syscusunitcode:delete")
+    @ResponseBody
+    public R delete(@RequestBody String[]sns) {
+        sysCusUnitCodeService.deleteBatch(sns);
+
+        return R.ok();
+    }
+
+    /**
+     * 查看所有列表
+     */
+    @RequestMapping("/queryAll")
+    @ResponseBody
+    public R queryAll(@RequestParam Map<String, Object> params) {
+
+        List<SysCusUnitCodeEntity> list = sysCusUnitCodeService.queryList(params);
+
+        return R.ok().put("list", list);
+    }
+}

kmall-admin/src/main/java/com/kmall/admin/dao/SysCusNationCodeDao.java

@@ -0,0 +1,15 @@
+package com.kmall.admin.dao;
+
+import com.kmall.admin.entity.SysCusNationCodeEntity;
+import com.kmall.common.dao.BaseDao;
+
+/**
+ * 国别地区代码Dao
+ *
+ * @author emato
+ * @email admin@qhdswl.com
+ * @date 2018-11-10 15:26:44
+ */
+public interface SysCusNationCodeDao extends BaseDao<SysCusNationCodeEntity> {
+
+}

kmall-admin/src/main/java/com/kmall/admin/dao/SysCusUnitCodeDao.java

@@ -0,0 +1,15 @@
+package com.kmall.admin.dao;
+
+import com.kmall.admin.entity.SysCusUnitCodeEntity;
+import com.kmall.common.dao.BaseDao;
+
+/**
+ * 计量单位代码Dao
+ *
+ * @author emato
+ * @email admin@qhdswl.com
+ * @date 2018-11-10 15:34:36
+ */
+public interface SysCusUnitCodeDao extends BaseDao<SysCusUnitCodeEntity> {
+
+}

kmall-admin/src/main/java/com/kmall/admin/entity/OrderRefundEntity.java

@@ -44,7 +44,7 @@ public class OrderRefundEntity implements Serializable {
      */
     private Date refundTime;
     /**
-     * 
+     *
      */
     private String creator;
     /**
@@ -60,12 +60,6 @@ public class OrderRefundEntity implements Serializable {
      */
     private String refundReason;
     /**
-     * 退款入账账户 1）退回银行卡：{银行名称}{卡类型}{卡尾号} 2）退回支付用户零钱:支付用户零钱3）退还商户:商户基本账户 商户结算银行账户4）退回支付用户零钱通:支付用户零钱通
-     */
-    private String refundRecvAccout;
-
-    private String wechatRefundStatusDes;
-    /**
      * 审核人
      */
     private String approver;
@@ -98,6 +92,12 @@ public class OrderRefundEntity implements Serializable {
      */
     private Date tstm;
 
+    private String refundRecvAccout;
+
+    private String wechatRefundStatusDes;
+
+
+
     /**
      * 冗余
      */
@@ -115,6 +115,54 @@ public class OrderRefundEntity implements Serializable {
 
     private String userName;
 
+    public String getOrderSn() {
+        return orderSn;
+    }
+
+    public void setOrderSn(String orderSn) {
+        this.orderSn = orderSn;
+    }
+
+    public Integer getOrderStatus() {
+        return orderStatus;
+    }
+
+    public void setOrderStatus(Integer orderStatus) {
+        this.orderStatus = orderStatus;
+    }
+
+    public BigDecimal getActualPrice() {
+        return actualPrice;
+    }
+
+    public void setActualPrice(BigDecimal actualPrice) {
+        this.actualPrice = actualPrice;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getWechatRefundStatusDes() {
+        return wechatRefundStatusDes;
+    }
+
+    public void setWechatRefundStatusDes(String wechatRefundStatusDes) {
+        this.wechatRefundStatusDes = wechatRefundStatusDes;
+    }
+
+    public String getRefundRecvAccout() {
+        return refundRecvAccout;
+    }
+
+    public void setRefundRecvAccout(String refundRecvAccout) {
+        this.refundRecvAccout = refundRecvAccout;
+    }
+
     /**
      * 设置：主键
      */
@@ -259,19 +307,6 @@ public class OrderRefundEntity implements Serializable {
         return refundReason;
     }
     /**
-     * 设置：退款入账账户 1）退回银行卡：{银行名称}{卡类型}{卡尾号} 2）退回支付用户零钱:支付用户零钱3）退还商户:商户基本账户 商户结算银行账户4）退回支付用户零钱通:支付用户零钱通
-     */
-    public void setRefundRecvAccout(String refundRecvAccout) {
-        this.refundRecvAccout = refundRecvAccout;
-    }
-
-    /**
-     * 获取：退款入账账户 1）退回银行卡：{银行名称}{卡类型}{卡尾号} 2）退回支付用户零钱:支付用户零钱3）退还商户:商户基本账户 商户结算银行账户4）退回支付用户零钱通:支付用户零钱通
-     */
-    public String getRefundRecvAccout() {
-        return refundRecvAccout;
-    }
-    /**
      * 设置：审核人
      */
     public void setApprover(String approver) {
@@ -375,44 +410,4 @@ public class OrderRefundEntity implements Serializable {
     public Date getTstm() {
         return tstm;
     }
-
-    public String getOrderSn() {
-        return orderSn;
-    }
-
-    public void setOrderSn(String orderSn) {
-        this.orderSn = orderSn;
-    }
-
-    public Integer getOrderStatus() {
-        return orderStatus;
-    }
-
-    public void setOrderStatus(Integer orderStatus) {
-        this.orderStatus = orderStatus;
-    }
-
-    public BigDecimal getActualPrice() {
-        return actualPrice;
-    }
-
-    public void setActualPrice(BigDecimal actualPrice) {
-        this.actualPrice = actualPrice;
-    }
-
-    public String getUserName() {
-        return userName;
-    }
-
-    public void setUserName(String userName) {
-        this.userName = userName;
-    }
-
-    public String getWechatRefundStatusDes() {
-        return wechatRefundStatusDes;
-    }
-
-    public void setWechatRefundStatusDes(String wechatRefundStatusDes) {
-        this.wechatRefundStatusDes = wechatRefundStatusDes;
-    }
 }

kmall-admin/src/main/java/com/kmall/admin/entity/SysCusNationCodeEntity.java

@@ -0,0 +1,222 @@
+package com.kmall.admin.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 国别地区代码实体
+ * 表名 sys_cus_nation_code
+ *
+ * @author emato
+ * @email admin@qhdswl.com
+ * @date 2018-11-10 15:26:44
+ */
+public class SysCusNationCodeEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 内部编号
+     */
+    private String sn;
+    /**
+     * 代码
+     */
+    private String code;
+    /**
+     * 名称(简称)
+     */
+    private String name;
+    /**
+     * 英文名(简称)
+     */
+    private String ename;
+    /**
+     * 优普税率类型
+     */
+    private String discountsTaxType;
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 是否有效,0:有效，1:无效
+     */
+    private String isValid;
+    /**
+     * 创建人编号
+     */
+    private String createrSn;
+    /**
+     * 创建时间,yyyy-MM-dd HH:mm:ss
+     */
+    private Date createTime;
+    /**
+     * 修改人编号
+     */
+    private String moderSn;
+    /**
+     * 修改时间,yyyy-MM-dd HH:mm:ss
+     */
+    private Date modTime;
+    /**
+     * 时间戳
+     */
+    private Date tstm;
+
+    /**
+     * 设置：内部编号
+     */
+    public void setSn(String sn) {
+        this.sn = sn;
+    }
+
+    /**
+     * 获取：内部编号
+     */
+    public String getSn() {
+        return sn;
+    }
+    /**
+     * 设置：代码
+     */
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    /**
+     * 获取：代码
+     */
+    public String getCode() {
+        return code;
+    }
+    /**
+     * 设置：名称(简称)
+     */
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    /**
+     * 获取：名称(简称)
+     */
+    public String getName() {
+        return name;
+    }
+    /**
+     * 设置：英文名(简称)
+     */
+    public void setEname(String ename) {
+        this.ename = ename;
+    }
+
+    /**
+     * 获取：英文名(简称)
+     */
+    public String getEname() {
+        return ename;
+    }
+    /**
+     * 设置：优普税率类型
+     */
+    public void setDiscountsTaxType(String discountsTaxType) {
+        this.discountsTaxType = discountsTaxType;
+    }
+
+    /**
+     * 获取：优普税率类型
+     */
+    public String getDiscountsTaxType() {
+        return discountsTaxType;
+    }
+    /**
+     * 设置：备注
+     */
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    /**
+     * 获取：备注
+     */
+    public String getRemark() {
+        return remark;
+    }
+    /**
+     * 设置：是否有效,0:有效，1:无效
+     */
+    public void setIsValid(String isValid) {
+        this.isValid = isValid;
+    }
+
+    /**
+     * 获取：是否有效,0:有效，1:无效
+     */
+    public String getIsValid() {
+        return isValid;
+    }
+    /**
+     * 设置：创建人编号
+     */
+    public void setCreaterSn(String createrSn) {
+        this.createrSn = createrSn;
+    }
+
+    /**
+     * 获取：创建人编号
+     */
+    public String getCreaterSn() {
+        return createrSn;
+    }
+    /**
+     * 设置：创建时间,yyyy-MM-dd HH:mm:ss
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * 获取：创建时间,yyyy-MM-dd HH:mm:ss
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+    /**
+     * 设置：修改人编号
+     */
+    public void setModerSn(String moderSn) {
+        this.moderSn = moderSn;
+    }
+
+    /**
+     * 获取：修改人编号
+     */
+    public String getModerSn() {
+        return moderSn;
+    }
+    /**
+     * 设置：修改时间,yyyy-MM-dd HH:mm:ss
+     */
+    public void setModTime(Date modTime) {
+        this.modTime = modTime;
+    }
+
+    /**
+     * 获取：修改时间,yyyy-MM-dd HH:mm:ss
+     */
+    public Date getModTime() {
+        return modTime;
+    }
+    /**
+     * 设置：时间戳
+     */
+    public void setTstm(Date tstm) {
+        this.tstm = tstm;
+    }
+
+    /**
+     * 获取：时间戳
+     */
+    public Date getTstm() {
+        return tstm;
+    }
+}

kmall-admin/src/main/java/com/kmall/admin/entity/SysCusUnitCodeEntity.java

@@ -0,0 +1,188 @@
+package com.kmall.admin.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 计量单位代码实体
+ * 表名 sys_cus_unit_code
+ *
+ * @author emato
+ * @email admin@qhdswl.com
+ * @date 2018-11-10 15:34:36
+ */
+public class SysCusUnitCodeEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 内部编号
+     */
+    private String sn;
+    /**
+     * 代码
+     */
+    private String code;
+    /**
+     * 名称
+     */
+    private String name;
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 是否有效,0:有效，1:无效
+     */
+    private String isValid;
+    /**
+     * 创建人编号
+     */
+    private String createrSn;
+    /**
+     * 创建时间,yyyy-MM-dd HH:mm:ss
+     */
+    private Date createTime;
+    /**
+     * 修改人编号
+     */
+    private String moderSn;
+    /**
+     * 修改时间,yyyy-MM-dd HH:mm:ss
+     */
+    private Date modTime;
+    /**
+     * 时间戳
+     */
+    private Date tstm;
+
+    /**
+     * 设置：内部编号
+     */
+    public void setSn(String sn) {
+        this.sn = sn;
+    }
+
+    /**
+     * 获取：内部编号
+     */
+    public String getSn() {
+        return sn;
+    }
+    /**
+     * 设置：代码
+     */
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    /**
+     * 获取：代码
+     */
+    public String getCode() {
+        return code;
+    }
+    /**
+     * 设置：名称
+     */
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    /**
+     * 获取：名称
+     */
+    public String getName() {
+        return name;
+    }
+    /**
+     * 设置：备注
+     */
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    /**
+     * 获取：备注
+     */
+    public String getRemark() {
+        return remark;
+    }
+    /**
+     * 设置：是否有效,0:有效，1:无效
+     */
+    public void setIsValid(String isValid) {
+        this.isValid = isValid;
+    }
+
+    /**
+     * 获取：是否有效,0:有效，1:无效
+     */
+    public String getIsValid() {
+        return isValid;
+    }
+    /**
+     * 设置：创建人编号
+     */
+    public void setCreaterSn(String createrSn) {
+        this.createrSn = createrSn;
+    }
+
+    /**
+     * 获取：创建人编号
+     */
+    public String getCreaterSn() {
+        return createrSn;
+    }
+    /**
+     * 设置：创建时间,yyyy-MM-dd HH:mm:ss
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * 获取：创建时间,yyyy-MM-dd HH:mm:ss
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+    /**
+     * 设置：修改人编号
+     */
+    public void setModerSn(String moderSn) {
+        this.moderSn = moderSn;
+    }
+
+    /**
+     * 获取：修改人编号
+     */
+    public String getModerSn() {
+        return moderSn;
+    }
+    /**
+     * 设置：修改时间,yyyy-MM-dd HH:mm:ss
+     */
+    public void setModTime(Date modTime) {
+        this.modTime = modTime;
+    }
+
+    /**
+     * 获取：修改时间,yyyy-MM-dd HH:mm:ss
+     */
+    public Date getModTime() {
+        return modTime;
+    }
+    /**
+     * 设置：时间戳
+     */
+    public void setTstm(Date tstm) {
+        this.tstm = tstm;
+    }
+
+    /**
+     * 获取：时间戳
+     */
+    public Date getTstm() {
+        return tstm;
+    }
+}

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

@@ -0,0 +1,72 @@
+package com.kmall.admin.service;
+
+import com.kmall.admin.entity.SysCusNationCodeEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 国别地区代码Service接口
+ *
+ * @author emato
+ * @email admin@qhdswl.com
+ * @date 2018-11-10 15:26:44
+ */
+public interface SysCusNationCodeService {
+
+    /**
+     * 根据主键查询实体
+     *
+     * @param sn 主键
+     * @return 实体
+     */
+    SysCusNationCodeEntity queryObject(String sn);
+
+    /**
+     * 分页查询
+     *
+     * @param map 参数
+     * @return list
+     */
+    List<SysCusNationCodeEntity> queryList(Map<String, Object> map);
+
+    /**
+     * 分页统计总数
+     *
+     * @param map 参数
+     * @return 总数
+     */
+    int queryTotal(Map<String, Object> map);
+
+    /**
+     * 保存实体
+     *
+     * @param sysCusNationCode 实体
+     * @return 保存条数
+     */
+    int save(SysCusNationCodeEntity sysCusNationCode);
+
+    /**
+     * 根据主键更新实体
+     *
+     * @param sysCusNationCode 实体
+     * @return 更新条数
+     */
+    int update(SysCusNationCodeEntity sysCusNationCode);
+
+    /**
+     * 根据主键删除
+     *
+     * @param sn
+     * @return 删除条数
+     */
+    int delete(String sn);
+
+    /**
+     * 根据主键批量删除
+     *
+     * @param sns
+     * @return 删除条数
+     */
+    int deleteBatch(String[] sns);
+}

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

@@ -0,0 +1,72 @@
+package com.kmall.admin.service;
+
+import com.kmall.admin.entity.SysCusUnitCodeEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 计量单位代码Service接口
+ *
+ * @author emato
+ * @email admin@qhdswl.com
+ * @date 2018-11-10 15:34:36
+ */
+public interface SysCusUnitCodeService {
+
+    /**
+     * 根据主键查询实体
+     *
+     * @param sn 主键
+     * @return 实体
+     */
+    SysCusUnitCodeEntity queryObject(String sn);
+
+    /**
+     * 分页查询
+     *
+     * @param map 参数
+     * @return list
+     */
+    List<SysCusUnitCodeEntity> queryList(Map<String, Object> map);
+
+    /**
+     * 分页统计总数
+     *
+     * @param map 参数
+     * @return 总数
+     */
+    int queryTotal(Map<String, Object> map);
+
+    /**
+     * 保存实体
+     *
+     * @param sysCusUnitCode 实体
+     * @return 保存条数
+     */
+    int save(SysCusUnitCodeEntity sysCusUnitCode);
+
+    /**
+     * 根据主键更新实体
+     *
+     * @param sysCusUnitCode 实体
+     * @return 更新条数
+     */
+    int update(SysCusUnitCodeEntity sysCusUnitCode);
+
+    /**
+     * 根据主键删除
+     *
+     * @param sn
+     * @return 删除条数
+     */
+    int delete(String sn);
+
+    /**
+     * 根据主键批量删除
+     *
+     * @param sns
+     * @return 删除条数
+     */
+    int deleteBatch(String[] sns);
+}

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

@@ -0,0 +1,59 @@
+package com.kmall.admin.service.impl;
+
+import com.kmall.admin.dao.SysCusNationCodeDao;
+import com.kmall.admin.entity.SysCusNationCodeEntity;
+import com.kmall.admin.service.SysCusNationCodeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 国别地区代码Service实现类
+ *
+ * @author emato
+ * @email admin@qhdswl.com
+ * @date 2018-11-10 15:26:44
+ */
+@Service("sysCusNationCodeService")
+public class SysCusNationCodeServiceImpl implements SysCusNationCodeService {
+    @Autowired
+    private SysCusNationCodeDao sysCusNationCodeDao;
+
+    @Override
+    public SysCusNationCodeEntity queryObject(String sn) {
+        return sysCusNationCodeDao.queryObject(sn);
+    }
+
+    @Override
+    public List<SysCusNationCodeEntity> queryList(Map<String, Object> map) {
+        return sysCusNationCodeDao.queryList(map);
+    }
+
+    @Override
+    public int queryTotal(Map<String, Object> map) {
+        return sysCusNationCodeDao.queryTotal(map);
+    }
+
+    @Override
+    public int save(SysCusNationCodeEntity sysCusNationCode) {
+        return sysCusNationCodeDao.save(sysCusNationCode);
+    }
+
+    @Override
+    public int update(SysCusNationCodeEntity sysCusNationCode) {
+        return sysCusNationCodeDao.update(sysCusNationCode);
+    }
+
+    @Override
+    public int delete(String sn) {
+        return sysCusNationCodeDao.delete(sn);
+    }
+
+    @Override
+    public int deleteBatch(String[]sns) {
+        return sysCusNationCodeDao.deleteBatch(sns);
+    }
+}

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

@@ -0,0 +1,58 @@
+package com.kmall.admin.service.impl;
+
+import com.kmall.admin.dao.SysCusUnitCodeDao;
+import com.kmall.admin.entity.SysCusUnitCodeEntity;
+import com.kmall.admin.service.SysCusUnitCodeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 计量单位代码Service实现类
+ *
+ * @author emato
+ * @email admin@qhdswl.com
+ * @date 2018-11-10 15:34:36
+ */
+@Service("sysCusUnitCodeService")
+public class SysCusUnitCodeServiceImpl implements SysCusUnitCodeService {
+    @Autowired
+    private SysCusUnitCodeDao sysCusUnitCodeDao;
+
+    @Override
+    public SysCusUnitCodeEntity queryObject(String sn) {
+        return sysCusUnitCodeDao.queryObject(sn);
+    }
+
+    @Override
+    public List<SysCusUnitCodeEntity> queryList(Map<String, Object> map) {
+        return sysCusUnitCodeDao.queryList(map);
+    }
+
+    @Override
+    public int queryTotal(Map<String, Object> map) {
+        return sysCusUnitCodeDao.queryTotal(map);
+    }
+
+    @Override
+    public int save(SysCusUnitCodeEntity sysCusUnitCode) {
+        return sysCusUnitCodeDao.save(sysCusUnitCode);
+    }
+
+    @Override
+    public int update(SysCusUnitCodeEntity sysCusUnitCode) {
+        return sysCusUnitCodeDao.update(sysCusUnitCode);
+    }
+
+    @Override
+    public int delete(String sn) {
+        return sysCusUnitCodeDao.delete(sn);
+    }
+
+    @Override
+    public int deleteBatch(String[]sns) {
+        return sysCusUnitCodeDao.deleteBatch(sns);
+    }
+}

kmall-admin/src/main/resources/conf/wx-mp.properties

@@ -16,7 +16,7 @@ wx.dev.paySignKey=U5XYsGSLMhhNFDBUWfgPGLsF3rG7GTXq
 #交易类型
 wx.dev.tradeType=JSAPI
 #证书名称，对应不同的商户号
-wx.dev.certName=D:/cert/apiclient_cert.p12
+wx.dev.certName=/cert/apiclient_cert.p12
 #支付回调地址
 wx.dev.notifyUrl=http://qhdswl.f3322.net:9001/platform-framework/api/pay/notify
 #获取code的请求地址

kmall-admin/src/main/resources/mybatis/mapper/OrderRefundDao.xml

@@ -7,16 +7,24 @@
         <result property="id" column="id"/>
         <result property="orderId" column="order_id"/>
         <result property="userId" column="user_id"/>
+        <result property="outRefundNo" column="out_refund_no"/>
+        <result property="refundId" column="refund_id"/>
         <result property="refundType" column="refund_type"/>
         <result property="refundTime" column="refund_time"/>
         <result property="creator" column="creator"/>
         <result property="refundMoney" column="refund_money"/>
-        <result property="refundReason" column="refund_reason"/>
         <result property="refundStatus" column="refund_status"/>
-        <result property="wechatRefundStatusDes" column="wechat_refund_status_des"/>
+        <result property="refundReason" column="refund_reason"/>
         <result property="approver" column="approver"/>
         <result property="approvalTime" column="approval_time"/>
         <result property="approvalRemark" column="approval_remark"/>
+        <result property="createSn" column="create_sn"/>
+        <result property="createTime" column="create_time"/>
+        <result property="moderSn" column="moder_sn"/>
+        <result property="modTime" column="mod_time"/>
+        <result property="tstm" column="tstm"/>
+        <result property="refundRecvAccout" column="refund_recv_accout"/>
+        <result property="wechatRefundStatusDes" column="wechat_refund_status_des"/>
         <result property="orderSn" column="order_sn"/>
         <result property="orderStatus" column="order_status"/>
         <result property="actualPrice" column="actual_price"/>
@@ -163,7 +171,8 @@
 			`wechat_refund_status_des`,
 			`approver`,
 			`approval_time`,
-			`approval_remark`)
+			`approval_remark`,
+			`out_refund_no`)
 		values(
 			#{orderId},
 			#{userId},
@@ -175,7 +184,8 @@
 			#{wechatRefundStatusDes},
 			#{approver},
 			#{approvalTime},
-			#{approvalRemark})
+			#{approvalRemark},
+			#{outRefundNo})
 	</insert>
 
     <update id="update" parameterType="com.kmall.admin.entity.OrderRefundEntity">
@@ -192,6 +202,7 @@
             <if test="approver != null">`approver` = #{approver},</if>
             <if test="approvalTime != null">`approval_time` = #{approvalTime},</if>
             <if test="approvalRemark != null">`approval_remark` = #{approvalRemark},</if>
+            <if test="outRefundNo != null">`out_refund_no` = #{outRefundNo},</if>
         </set>
         where id = #{id}
     </update>

kmall-admin/src/main/resources/mybatis/mapper/SysCusNationCodeDao.xml

@@ -0,0 +1,137 @@
+<?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.SysCusNationCodeDao">
+
+    <resultMap type="com.kmall.admin.entity.SysCusNationCodeEntity" id="sysCusNationCodeMap">
+        <result property="sn" column="sn"/>
+        <result property="code" column="code"/>
+        <result property="name" column="name"/>
+        <result property="ename" column="ename"/>
+        <result property="discountsTaxType" column="discounts_tax_type"/>
+        <result property="remark" column="remark"/>
+        <result property="isValid" column="is_valid"/>
+        <result property="createrSn" column="creater_sn"/>
+        <result property="createTime" column="create_time"/>
+        <result property="moderSn" column="moder_sn"/>
+        <result property="modTime" column="mod_time"/>
+        <result property="tstm" column="tstm"/>
+    </resultMap>
+
+	<select id="queryObject" resultType="com.kmall.admin.entity.SysCusNationCodeEntity">
+		select
+			`sn`,
+			`code`,
+			`name`,
+			`ename`,
+			`discounts_tax_type`,
+			`remark`,
+			`is_valid`,
+			`creater_sn`,
+			`create_time`,
+			`moder_sn`,
+			`mod_time`,
+			`tstm`
+		from sys_cus_nation_code
+		where sn = #{id}
+	</select>
+
+	<select id="queryList" resultType="com.kmall.admin.entity.SysCusNationCodeEntity">
+		select
+    		`sn`,
+    		`code`,
+    		`name`,
+    		`ename`,
+    		`discounts_tax_type`,
+    		`remark`,
+    		`is_valid`,
+    		`creater_sn`,
+    		`create_time`,
+    		`moder_sn`,
+    		`mod_time`,
+    		`tstm`
+		from sys_cus_nation_code
+		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 sn desc
+			</otherwise>
+        </choose>
+		<if test="offset != null and limit != null">
+			limit #{offset}, #{limit}
+		</if>
+	</select>
+	
+ 	<select id="queryTotal" resultType="int">
+		select count(*) from sys_cus_nation_code
+		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.SysCusNationCodeEntity">
+		insert into sys_cus_nation_code(
+			`sn`,
+			`code`,
+			`name`,
+			`ename`,
+			`discounts_tax_type`,
+			`remark`,
+			`is_valid`,
+			`creater_sn`,
+			`create_time`,
+			`moder_sn`,
+			`mod_time`,
+			`tstm`)
+		values(
+			#{sn},
+			#{code},
+			#{name},
+			#{ename},
+			#{discountsTaxType},
+			#{remark},
+			#{isValid},
+			#{createrSn},
+			#{createTime},
+			#{moderSn},
+			#{modTime},
+			#{tstm})
+	</insert>
+	 
+	<update id="update" parameterType="com.kmall.admin.entity.SysCusNationCodeEntity">
+		update sys_cus_nation_code 
+		<set>
+			<if test="code != null">`code` = #{code}, </if>
+			<if test="name != null">`name` = #{name}, </if>
+			<if test="ename != null">`ename` = #{ename}, </if>
+			<if test="discountsTaxType != null">`discounts_tax_type` = #{discountsTaxType}, </if>
+			<if test="remark != null">`remark` = #{remark}, </if>
+			<if test="isValid != null">`is_valid` = #{isValid}, </if>
+			<if test="createrSn != null">`creater_sn` = #{createrSn}, </if>
+			<if test="createTime != null">`create_time` = #{createTime}, </if>
+			<if test="moderSn != null">`moder_sn` = #{moderSn}, </if>
+			<if test="modTime != null">`mod_time` = #{modTime}, </if>
+			<if test="tstm != null">`tstm` = #{tstm}</if>
+		</set>
+		where sn = #{sn}
+	</update>
+	
+	<delete id="delete">
+		delete from sys_cus_nation_code where sn = #{value}
+	</delete>
+	
+	<delete id="deleteBatch">
+		delete from sys_cus_nation_code where sn in 
+		<foreach item="sn" collection="array" open="(" separator="," close=")">
+			#{sn}
+		</foreach>
+	</delete>
+
+</mapper>

kmall-admin/src/main/resources/mybatis/mapper/SysCusUnitCodeDao.xml

@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.kmall.admin.dao.SysCusUnitCodeDao">
+
+    <resultMap type="com.kmall.admin.entity.SysCusUnitCodeEntity" id="sysCusUnitCodeMap">
+        <result property="sn" column="sn"/>
+        <result property="code" column="code"/>
+        <result property="name" column="name"/>
+        <result property="remark" column="remark"/>
+        <result property="isValid" column="is_valid"/>
+        <result property="createrSn" column="creater_sn"/>
+        <result property="createTime" column="create_time"/>
+        <result property="moderSn" column="moder_sn"/>
+        <result property="modTime" column="mod_time"/>
+        <result property="tstm" column="tstm"/>
+    </resultMap>
+
+	<select id="queryObject" resultType="com.kmall.admin.entity.SysCusUnitCodeEntity">
+		select
+			`sn`,
+			`code`,
+			`name`,
+			`remark`,
+			`is_valid`,
+			`creater_sn`,
+			`create_time`,
+			`moder_sn`,
+			`mod_time`,
+			`tstm`
+		from sys_cus_unit_code
+		where sn = #{id}
+	</select>
+
+	<select id="queryList" resultType="com.kmall.admin.entity.SysCusUnitCodeEntity">
+		select
+    		`sn`,
+    		`code`,
+    		`name`,
+    		`remark`,
+    		`is_valid`,
+    		`creater_sn`,
+    		`create_time`,
+    		`moder_sn`,
+    		`mod_time`,
+    		`tstm`
+		from sys_cus_unit_code
+		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 sn desc
+			</otherwise>
+        </choose>
+		<if test="offset != null and limit != null">
+			limit #{offset}, #{limit}
+		</if>
+	</select>
+	
+ 	<select id="queryTotal" resultType="int">
+		select count(*) from sys_cus_unit_code
+		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.SysCusUnitCodeEntity">
+		insert into sys_cus_unit_code(
+			`sn`,
+			`code`,
+			`name`,
+			`remark`,
+			`is_valid`,
+			`creater_sn`,
+			`create_time`,
+			`moder_sn`,
+			`mod_time`,
+			`tstm`)
+		values(
+			#{sn},
+			#{code},
+			#{name},
+			#{remark},
+			#{isValid},
+			#{createrSn},
+			#{createTime},
+			#{moderSn},
+			#{modTime},
+			#{tstm})
+	</insert>
+	 
+	<update id="update" parameterType="com.kmall.admin.entity.SysCusUnitCodeEntity">
+		update sys_cus_unit_code 
+		<set>
+			<if test="code != null">`code` = #{code}, </if>
+			<if test="name != null">`name` = #{name}, </if>
+			<if test="remark != null">`remark` = #{remark}, </if>
+			<if test="isValid != null">`is_valid` = #{isValid}, </if>
+			<if test="createrSn != null">`creater_sn` = #{createrSn}, </if>
+			<if test="createTime != null">`create_time` = #{createTime}, </if>
+			<if test="moderSn != null">`moder_sn` = #{moderSn}, </if>
+			<if test="modTime != null">`mod_time` = #{modTime}, </if>
+			<if test="tstm != null">`tstm` = #{tstm}</if>
+		</set>
+		where sn = #{sn}
+	</update>
+	
+	<delete id="delete">
+		delete from sys_cus_unit_code where sn = #{value}
+	</delete>
+	
+	<delete id="deleteBatch">
+		delete from sys_cus_unit_code where sn in 
+		<foreach item="sn" collection="array" open="(" separator="," close=")">
+			#{sn}
+		</foreach>
+	</delete>
+
+</mapper>

kmall-api/src/main/java/com/kmall/api/api/ApiOrderController.java

@@ -397,6 +397,8 @@ public class ApiOrderController extends ApiBaseAction {
             orderRefund.setModTime(new Date());
             if(list.size()>1){//多条订单
                 orderRefund.setRefundType(Integer.parseInt(Dict.RefundType.item_2.getItem()));//部分退款
+            }else{
+                orderRefund.setRefundType(Integer.parseInt(Dict.RefundType.item_1.getItem()));//用户全额退款
             }
             orderRefund.setRefundMoney(orderInfo.getActual_price());
 

kmall-api/src/main/java/com/kmall/api/service/ApiPayService.java

@@ -193,10 +193,10 @@ public class ApiPayService {
     }
 
 
-    /**
+   /* *//**
      * 退款
-     * @param orderInfo
-     */
+     * @param
+     *//*
     @Transactional
     public void refund(OrderVo orderInfo,WechatRefundApiResult result,String reason) {
         boolean needUpdateStock = true;
@@ -261,15 +261,7 @@ public class ApiPayService {
             storeRelaEntity.setStockNum(storeRelaEntity.getStockNum() + orderGoodsEntity.getNumber());//库存数量
             apiProductStoreRelaMapper.update(storeRelaEntity);
         }
-        /*// 是否是团购订单
-        if (null != orderInfo.getOrder_type() && orderInfo.getOrder_type().equals("2")) {
-            GoodsGroupOpenDetailVo openVo = apiGoodsGroupOpenDetailService.queryObject(orderInfo.getActivity_id());
-            if (null != openVo) {
-                openVo.setAttend_status(3);
-                apiGoodsGroupOpenDetailService.update(openVo);
-            }
-        }*/
-    }
+    }*/
 
 
     @Transactional
@@ -303,14 +295,8 @@ public class ApiPayService {
                             orderRefund.setRefundStatus(Integer.parseInt(Dict.RefundStatus.item_4.getItem()));
                             orderRefund.setWechatRefundStatusDes("退款异常");
                         }
-                        String account = refundApiResult.getRefund_recv_accout();
-                        try{
-                            account = new String(account.getBytes("UTF-8"), "ISO-8859-1");
-                        }catch (Exception e){
-                            logger.error("转换异常：",e);
-                        }
-                        orderRefund.setRefundRecvAccout(account);
-                        orderRefund.setOutRefundNo(refundApiResult.getOut_trade_no());
+                        orderRefund.setRefundRecvAccout(refundApiResult.getRefund_recv_accout());
+                        orderRefund.setId(mallOrderRefund.getId());
                         mallOrderRefundMapper.update(orderRefund);//更新订单退款信息
 
                         OrderVo orderVo = new OrderVo();

kmall-schedule/src/main/java/com/kmall/schedule/service/QzOrderService.java

@@ -1,5 +1,6 @@
 package com.kmall.schedule.service;
 
+import com.kmall.common.utils.Constant;
 import com.kmall.common.utils.wechat.ReaderXmlForDOM4J;
 import com.kmall.common.utils.wechat.WechatRefundApiResult;
 import com.kmall.common.utils.wechat.WechatRefundQueryResult;
@@ -241,7 +242,7 @@ public class QzOrderService {
                                     refundRaram.put("refundTime", successTime);
                                     refundRaram.put("outRefundNo", result.getOut_refund_no());
                                     refundRaram.put("refundId", result.getRefund_id());
-                                    refundRaram.put("refundMoney", result.getRefund_fee());
+                                    refundRaram.put("refundMoney", BigDecimal.valueOf(Long.valueOf(result.getRefund_fee())).divide(Constant.ONE_HUNDRED));
                                     if (result.getRefund_status().equalsIgnoreCase("SUCCESS")) {
                                         refundRaram.put("refundStatus", 2);
                                         refundRaram.put("wechat_refund_status_des", "退款成功");

kmall-schedule/src/main/resources/mybatis/mapper/QzOrderMapper.xml

@@ -50,8 +50,9 @@
     <select id="queryRefundOrderList" resultType="map">
         select a.pay_transaction_id,a.merch_order_sn,a.order_sn,a.order_status,a.pay_status,f.out_refund_no,f.refund_id,f.order_id,f.id 'orderRefundId'
         from mall_order a
-        inner join mall_order_refund f on a.id = f.order_id	where (f.out_refund_no is null or f.refund_id is null) and a.order_status = '401' and f.refund_status
-        not in (1,3,4)
+        inner join mall_order_refund f on a.id = f.order_id	where (f.out_refund_no is null or f.refund_id is null
+        or f.refund_time is null or f.wechat_refund_status_des is null) and a.order_status = '401' and f.refund_status
+        in (2,5)
     </select>
 
     <select id="queryPayingOrderList" resultType="map">
@@ -81,6 +82,7 @@
             <if test="refundStatus != null">a.refund_status = #{refundStatus},</if>
             <if test="refundRecvAccout != null">a.refund_recv_accout = #{refundRecvAccout},</if>
             <if test="refundTime != null">a.refund_time = #{refundTime},</if>
+            <if test="wechat_refund_status_des != null">a.wechat_refund_status_des = #{wechat_refund_status_des},</if>
         </set>
         WHERE 1 = 1
         AND a.out_refund_no = #{orderRefundId}

wx-mall/pages/goods/goods.wxml

@@ -101,7 +101,7 @@
     </view>-->
     <view class="comments" bindtap="hideSwitchAttrPop">
       <view class="h">
-        <navigator url='{{comment.count > 0?"../comment/comment?valueId="+goods.id+"&typeId=0":""}}'>
+        <navigator url='../comment/comment?valueId={{goods.id}}&typeId=0'>
           <text class="t">评价({{comment.count > 999 ? '999+' : comment.count}})</text>
           <text class="i">查看全部</text>
         </navigator>