From becfeb9668e553869ff0cc9f2fea0d58afc79125 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Wed, 5 Aug 2020 15:24:53 +0800 Subject: [PATCH] update --- .../src/main/resources/application-dev.yml | 4 ++-- .../src/main/resources/application-prod.yml | 4 ++-- .../src/main/resources/application-dev.yml | 4 ++-- .../src/main/resources/application-prod.yml | 4 ++-- .../controller/WxCouponOrderController.java | 2 +- .../src/main/resources/application-dev.yml | 4 ++-- .../src/main/resources/application-prod.yml | 4 ++-- .../src/main/resources/application-dev.yml | 4 ++-- .../src/main/resources/application-prod.yml | 4 ++-- .../src/main/resources/application-dev.yml | 4 ++-- .../src/main/resources/application-prod.yml | 4 ++-- .../src/main/resources/application-dev.yml | 4 ++-- .../src/main/resources/application-prod.yml | 4 ++-- .../src/main/resources/application-dev.yml | 4 ++-- .../src/main/resources/application-prod.yml | 4 ++-- .../iformall/domain/vo/WxCouponOrderCVo.java | 1 + .../service/impl/WxPayOrderServiceImpl.java | 1 + .../resources/mapper/WxCouponOrderMapper.xml | 18 +++++++++++------- .../main/resources/mapper/WxOrderMapper.xml | 16 ++++++++-------- .../src/main/resources/application-dev.yml | 4 ++-- .../src/main/resources/application-prod.yml | 4 ++-- .../src/main/resources/application-dev.yml | 4 ++-- .../src/main/resources/application-prod.yml | 4 ++-- 23 files changed, 58 insertions(+), 52 deletions(-) diff --git a/mallinkAdmin/src/main/resources/application-dev.yml b/mallinkAdmin/src/main/resources/application-dev.yml index b64a39b9f..5f53e53b6 100644 --- a/mallinkAdmin/src/main/resources/application-dev.yml +++ b/mallinkAdmin/src/main/resources/application-dev.yml @@ -63,8 +63,8 @@ spring: # EMAIL mail: host: smtp.exmail.qq.com - username: zhengfangyuan@iformall.com - password: xnydCeUzofB2h8qp # 授权密码 + username: service@iformall.com + password: jGvApygXN7wc5SzN # 授权密码 properties: mail: smtp: diff --git a/mallinkAdmin/src/main/resources/application-prod.yml b/mallinkAdmin/src/main/resources/application-prod.yml index 8de9b67a0..ac35f6f34 100644 --- a/mallinkAdmin/src/main/resources/application-prod.yml +++ b/mallinkAdmin/src/main/resources/application-prod.yml @@ -58,8 +58,8 @@ spring: # EMAIL mail: host: smtp.exmail.qq.com - username: zhengfangyuan@iformall.com - password: xnydCeUzofB2h8qp # 授权密码 + username: service@iformall.com + password: jGvApygXN7wc5SzN # 授权密码 properties: mail: smtp: diff --git a/mallinkBApi/src/main/resources/application-dev.yml b/mallinkBApi/src/main/resources/application-dev.yml index fabba4767..df08d31d1 100644 --- a/mallinkBApi/src/main/resources/application-dev.yml +++ b/mallinkBApi/src/main/resources/application-dev.yml @@ -62,8 +62,8 @@ spring: # EMAIL mail: host: smtp.exmail.qq.com - username: zhengfangyuan@iformall.com - password: xnydCeUzofB2h8qp # 授权密码 + username: service@iformall.com + password: jGvApygXN7wc5SzN # 授权密码 properties: mail: smtp: diff --git a/mallinkBApi/src/main/resources/application-prod.yml b/mallinkBApi/src/main/resources/application-prod.yml index b06feacc4..684cc245e 100644 --- a/mallinkBApi/src/main/resources/application-prod.yml +++ b/mallinkBApi/src/main/resources/application-prod.yml @@ -57,8 +57,8 @@ spring: # EMAIL mail: host: smtp.exmail.qq.com - username: zhengfangyuan@iformall.com - password: xnydCeUzofB2h8qp # 授权密码 + username: service@iformall.com + password: jGvApygXN7wc5SzN # 授权密码 properties: mail: smtp: diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java index 745f26531..11bec116d 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java @@ -58,7 +58,7 @@ public class WxCouponOrderController extends BaseController { @Autowired StringRedisTemplate stringRedisTemplate; - @RedisCache(expireTime = 100) + //@RedisCache(expireTime = 100) @ApiOperation("券包分页列表接口") @GetMapping("list") @ApiImplicitParams({ diff --git a/mallinkCApi/src/main/resources/application-dev.yml b/mallinkCApi/src/main/resources/application-dev.yml index ca508cda6..0b0807a78 100644 --- a/mallinkCApi/src/main/resources/application-dev.yml +++ b/mallinkCApi/src/main/resources/application-dev.yml @@ -62,8 +62,8 @@ spring: # EMAIL mail: host: smtp.exmail.qq.com - username: zhengfangyuan@iformall.com - password: xnydCeUzofB2h8qp # 授权密码 + username: service@iformall.com + password: jGvApygXN7wc5SzN # 授权密码 properties: mail: smtp: diff --git a/mallinkCApi/src/main/resources/application-prod.yml b/mallinkCApi/src/main/resources/application-prod.yml index 5efbe5257..4c9b40f86 100644 --- a/mallinkCApi/src/main/resources/application-prod.yml +++ b/mallinkCApi/src/main/resources/application-prod.yml @@ -57,8 +57,8 @@ spring: # EMAIL mail: host: smtp.exmail.qq.com - username: zhengfangyuan@iformall.com - password: xnydCeUzofB2h8qp # 授权密码 + username: service@iformall.com + password: jGvApygXN7wc5SzN # 授权密码 properties: mail: smtp: diff --git a/mallinkCallback/src/main/resources/application-dev.yml b/mallinkCallback/src/main/resources/application-dev.yml index 53906c9b4..b0d39f1fe 100644 --- a/mallinkCallback/src/main/resources/application-dev.yml +++ b/mallinkCallback/src/main/resources/application-dev.yml @@ -63,8 +63,8 @@ spring: # EMAIL mail: host: smtp.exmail.qq.com - username: zhengfangyuan@iformall.com - password: xnydCeUzofB2h8qp # 授权密码 + username: service@iformall.com + password: jGvApygXN7wc5SzN # 授权密码 properties: mail: smtp: diff --git a/mallinkCallback/src/main/resources/application-prod.yml b/mallinkCallback/src/main/resources/application-prod.yml index 1c425ee19..8c1f57158 100644 --- a/mallinkCallback/src/main/resources/application-prod.yml +++ b/mallinkCallback/src/main/resources/application-prod.yml @@ -58,8 +58,8 @@ spring: # EMAIL mail: host: smtp.exmail.qq.com - username: zhengfangyuan@iformall.com - password: xnydCeUzofB2h8qp # 授权密码 + username: service@iformall.com + password: jGvApygXN7wc5SzN # 授权密码 properties: mail: smtp: diff --git a/mallinkMQConsumer/src/main/resources/application-dev.yml b/mallinkMQConsumer/src/main/resources/application-dev.yml index 3313a3a39..91e405d82 100644 --- a/mallinkMQConsumer/src/main/resources/application-dev.yml +++ b/mallinkMQConsumer/src/main/resources/application-dev.yml @@ -64,8 +64,8 @@ spring: # EMAIL mail: host: smtp.exmail.qq.com - username: zhengfangyuan@iformall.com - password: xnydCeUzofB2h8qp # 授权密码 + username: service@iformall.com + password: jGvApygXN7wc5SzN # 授权密码 properties: mail: smtp: diff --git a/mallinkMQConsumer/src/main/resources/application-prod.yml b/mallinkMQConsumer/src/main/resources/application-prod.yml index 0c0d51aed..615eb0ca7 100644 --- a/mallinkMQConsumer/src/main/resources/application-prod.yml +++ b/mallinkMQConsumer/src/main/resources/application-prod.yml @@ -57,8 +57,8 @@ spring: # EMAIL mail: host: smtp.exmail.qq.com - username: zhengfangyuan@iformall.com - password: xnydCeUzofB2h8qp # 授权密码 + username: service@iformall.com + password: jGvApygXN7wc5SzN # 授权密码 properties: mail: smtp: diff --git a/mallinkPosApi/src/main/resources/application-dev.yml b/mallinkPosApi/src/main/resources/application-dev.yml index 144803a96..3d2b2e1ea 100644 --- a/mallinkPosApi/src/main/resources/application-dev.yml +++ b/mallinkPosApi/src/main/resources/application-dev.yml @@ -62,8 +62,8 @@ spring: # EMAIL mail: host: smtp.exmail.qq.com - username: zhengfangyuan@iformall.com - password: xnydCeUzofB2h8qp # 授权密码 + username: service@iformall.com + password: jGvApygXN7wc5SzN # 授权密码 properties: mail: smtp: diff --git a/mallinkPosApi/src/main/resources/application-prod.yml b/mallinkPosApi/src/main/resources/application-prod.yml index d51c351a4..451f12fbe 100644 --- a/mallinkPosApi/src/main/resources/application-prod.yml +++ b/mallinkPosApi/src/main/resources/application-prod.yml @@ -56,8 +56,8 @@ spring: # EMAIL mail: host: smtp.exmail.qq.com - username: zhengfangyuan@iformall.com - password: xnydCeUzofB2h8qp # 授权密码 + username: service@iformall.com + password: jGvApygXN7wc5SzN # 授权密码 properties: mail: smtp: diff --git a/mallinkSchedule/src/main/resources/application-dev.yml b/mallinkSchedule/src/main/resources/application-dev.yml index 45e300735..816b27566 100644 --- a/mallinkSchedule/src/main/resources/application-dev.yml +++ b/mallinkSchedule/src/main/resources/application-dev.yml @@ -64,8 +64,8 @@ spring: # EMAIL mail: host: smtp.exmail.qq.com - username: zhengfangyuan@iformall.com - password: xnydCeUzofB2h8qp # 授权密码 + username: service@iformall.com + password: jGvApygXN7wc5SzN # 授权密码 properties: mail: smtp: diff --git a/mallinkSchedule/src/main/resources/application-prod.yml b/mallinkSchedule/src/main/resources/application-prod.yml index c21611e26..feff24cfe 100644 --- a/mallinkSchedule/src/main/resources/application-prod.yml +++ b/mallinkSchedule/src/main/resources/application-prod.yml @@ -57,8 +57,8 @@ spring: # EMAIL mail: host: smtp.exmail.qq.com - username: zhengfangyuan@iformall.com - password: xnydCeUzofB2h8qp # 授权密码 + username: service@iformall.com + password: jGvApygXN7wc5SzN # 授权密码 properties: mail: smtp: diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderCVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderCVo.java index 79cfcdffb..910aeeff3 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderCVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderCVo.java @@ -79,6 +79,7 @@ public class WxCouponOrderCVo extends WxCouponOrder { @io.swagger.annotations.ApiModelProperty(value="商户名",name="name") private String merchantName; + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="卡券来源",name="sendChannelType") private Integer sendChannelType; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java index 29c45ab71..79865876b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java @@ -151,6 +151,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { logger.error(e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "订单更新"); } + // 下订单完成,发送内部消息 try { wxOrderService.sendOrderSuccessActionMsg(order); diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index 56d9c9fc9..07b55f52e 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -983,12 +983,6 @@ - - co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.coupon_type,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price,co.verify_type, - c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.price,c.unit,c.valid_type,c.valid_start_date,c.valid_end_date,c.auto_refund, - cal.channel_type as send_channel_type - - co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.coupon_type,co.c_user_id,co.owner_id,co.b_user_id,co.order_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price,co.verify_type, c.type,c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.price,c.unit,c.detail,c.remark,c.valid_type,c.valid_start_date,c.valid_end_date,c.auto_refund @@ -1102,10 +1096,20 @@ order by ${sortColumns} --> + + + co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.coupon_type,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price,co.verify_type, + c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.price,c.unit,c.valid_type,c.valid_start_date,c.valid_end_date,c.auto_refund + + - - o.id,o.order_number,o.tenant_id,o.parent_tenant_id,o.c_user_id,o.coupon_channel_id,o.product_id,o.payment_type,o.payment,o.payment_time,o.order_status,o.create_date,o.update_date, - c.type,c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.price,c.unit,c.valid_start_date,c.valid_end_date, - cal.channel_type as send_channel_type - - - o.id,o.order_number,o.tenant_id,o.parent_tenant_id,o.c_user_id,o.coupon_channel_id,o.product_id,o.payment_type,o.payment,o.payment_time,o.order_status,o.create_date,o.update_date, c.type,c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.price,c.unit,c.detail,c.remark,c.valid_start_date,c.valid_end_date, @@ -310,12 +303,19 @@ + + +