浏览代码

Merge remote-tracking branch 'origin/photo' into private_deployment

# Conflicts:
#	suimangService/src/main/java/com/iformall/common/ErrorCode.java
private_deployment
xmzhao71 1年前
父节点
当前提交
72f437ef3e
共有 2 个文件被更改,包括 4 次插入4 次删除
  1. +3
    -3
      suimangService/src/main/java/com/iformall/common/ErrorCode.java
  2. +1
    -1
      suimangService/src/main/resources/mapper/ProductOrderPayMapper.xml

+ 3
- 3
suimangService/src/main/java/com/iformall/common/ErrorCode.java 查看文件

@@ -677,10 +677,10 @@ public enum ErrorCode{
*/
ORDER_CREAT_OVERRUN(64000, "重复生成次数超限"),

CODE_ALREADY_EXISTS(71000, "该code已存在")
;
CODE_ALREADY_EXISTS(71000, "该code已存在"),
;

private int code;
private int code;
private String message;

ErrorCode(int code, String message) {


+ 1
- 1
suimangService/src/main/resources/mapper/ProductOrderPayMapper.xml 查看文件

@@ -138,7 +138,7 @@
and `pay_vendor` = #{payVendor}
</select>

<update id="orderPayUpdStatus" parameterType="java.util.HashMap">
<update id="updStatusByOrder" parameterType="java.util.HashMap">
update product_order_pay
set `pay_order_status` = #{payOrderStatus}
,`update_date` = now()


正在加载...
取消
保存