Przeglądaj źródła

update

release_toaliyun_real
xiaohanzi 5 lat temu
rodzic
commit
becfeb9668
23 zmienionych plików z 58 dodań i 52 usunięć
  1. +2
    -2
      mallinkAdmin/src/main/resources/application-dev.yml
  2. +2
    -2
      mallinkAdmin/src/main/resources/application-prod.yml
  3. +2
    -2
      mallinkBApi/src/main/resources/application-dev.yml
  4. +2
    -2
      mallinkBApi/src/main/resources/application-prod.yml
  5. +1
    -1
      mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java
  6. +2
    -2
      mallinkCApi/src/main/resources/application-dev.yml
  7. +2
    -2
      mallinkCApi/src/main/resources/application-prod.yml
  8. +2
    -2
      mallinkCallback/src/main/resources/application-dev.yml
  9. +2
    -2
      mallinkCallback/src/main/resources/application-prod.yml
  10. +2
    -2
      mallinkMQConsumer/src/main/resources/application-dev.yml
  11. +2
    -2
      mallinkMQConsumer/src/main/resources/application-prod.yml
  12. +2
    -2
      mallinkPosApi/src/main/resources/application-dev.yml
  13. +2
    -2
      mallinkPosApi/src/main/resources/application-prod.yml
  14. +2
    -2
      mallinkSchedule/src/main/resources/application-dev.yml
  15. +2
    -2
      mallinkSchedule/src/main/resources/application-prod.yml
  16. +1
    -0
      mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderCVo.java
  17. +1
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java
  18. +11
    -7
      mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml
  19. +8
    -8
      mallinkService/src/main/resources/mapper/WxOrderMapper.xml
  20. +2
    -2
      mallinkSysAdmin/src/main/resources/application-dev.yml
  21. +2
    -2
      mallinkSysAdmin/src/main/resources/application-prod.yml
  22. +2
    -2
      mallinkWebSocketServer/src/main/resources/application-dev.yml
  23. +2
    -2
      mallinkWebSocketServer/src/main/resources/application-prod.yml

+ 2
- 2
mallinkAdmin/src/main/resources/application-dev.yml Wyświetl plik

@@ -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:


+ 2
- 2
mallinkAdmin/src/main/resources/application-prod.yml Wyświetl plik

@@ -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:


+ 2
- 2
mallinkBApi/src/main/resources/application-dev.yml Wyświetl plik

@@ -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:


+ 2
- 2
mallinkBApi/src/main/resources/application-prod.yml Wyświetl plik

@@ -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:


+ 1
- 1
mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java Wyświetl plik

@@ -58,7 +58,7 @@ public class WxCouponOrderController extends BaseController {
@Autowired
StringRedisTemplate stringRedisTemplate;

@RedisCache(expireTime = 100)
//@RedisCache(expireTime = 100)
@ApiOperation("券包分页列表接口")
@GetMapping("list")
@ApiImplicitParams({


+ 2
- 2
mallinkCApi/src/main/resources/application-dev.yml Wyświetl plik

@@ -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:


+ 2
- 2
mallinkCApi/src/main/resources/application-prod.yml Wyświetl plik

@@ -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:


+ 2
- 2
mallinkCallback/src/main/resources/application-dev.yml Wyświetl plik

@@ -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:


+ 2
- 2
mallinkCallback/src/main/resources/application-prod.yml Wyświetl plik

@@ -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:


+ 2
- 2
mallinkMQConsumer/src/main/resources/application-dev.yml Wyświetl plik

@@ -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:


+ 2
- 2
mallinkMQConsumer/src/main/resources/application-prod.yml Wyświetl plik

@@ -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:


+ 2
- 2
mallinkPosApi/src/main/resources/application-dev.yml Wyświetl plik

@@ -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:


+ 2
- 2
mallinkPosApi/src/main/resources/application-prod.yml Wyświetl plik

@@ -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:


+ 2
- 2
mallinkSchedule/src/main/resources/application-dev.yml Wyświetl plik

@@ -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:


+ 2
- 2
mallinkSchedule/src/main/resources/application-prod.yml Wyświetl plik

@@ -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:


+ 1
- 0
mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderCVo.java Wyświetl plik

@@ -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;



+ 1
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java Wyświetl plik

@@ -151,6 +151,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService {
logger.error(e.getMessage());
throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "订单更新");
}
// 下订单完成,发送内部消息
try {
wxOrderService.sendOrderSuccessActionMsg(order);


+ 11
- 7
mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml Wyświetl plik

@@ -983,12 +983,6 @@



<sql id="allCUserCouponOrderListColumns">
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
</sql>

<sql id="allCUserCouponOrderDetailColumns">
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 @@
<if test=" null != sortColumns"> order by ${sortColumns} </if>
</select> -->

<!-- <sql id="allCUserCouponOrderListColumns">
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
</sql> -->
<sql id="allCUserCouponOrderListColumns">
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
</sql>

<select id="findListOfCUserOptimize" parameterType="com.iformall.domain.vo.WxCouponOrderCVo" resultMap="CVoResultMapOptimize">
select <include refid="allCUserCouponOrderListColumns" />
from wx_coupon c,wx_coupon_order co
left join wx_coupon_action_log cal on cal.coupon_order_id = co.id
<!-- left join wx_coupon_action_log cal on cal.coupon_order_id = co.id -->
where 1=1
and co.coupon_id = c.id
and co.coupon_type != 5


+ 8
- 8
mallinkService/src/main/resources/mapper/WxOrderMapper.xml Wyświetl plik

@@ -220,13 +220,6 @@
</select>


<sql id="allCUserOrderListColumns">
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
</sql>


<sql id="allCUserOrderDetailColumns">
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 @@
</collection>
</resultMap>


<!-- <sql id="allCUserOrderListColumns">
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
</sql> -->

<select id="findListOfCUser" parameterType="com.iformall.domain.po.WxOrder" resultMap="CVoResultMap">
select
<include refid="allCUserOrderListColumns"/>
from wx_coupon c,wx_order o
left join wx_coupon_order co on co.order_id = o.id
left join wx_coupon_action_log cal on cal.coupon_order_id = co.id
<!-- left join wx_coupon_action_log cal on cal.coupon_order_id = co.id -->
where o.product_id = c.id and o.order_status in (0,1,2,3,4,5)
<if test="cUserId != null">
and o.c_user_id = #{cUserId}


+ 2
- 2
mallinkSysAdmin/src/main/resources/application-dev.yml Wyświetl plik

@@ -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:


+ 2
- 2
mallinkSysAdmin/src/main/resources/application-prod.yml Wyświetl plik

@@ -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:


+ 2
- 2
mallinkWebSocketServer/src/main/resources/application-dev.yml Wyświetl plik

@@ -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:


+ 2
- 2
mallinkWebSocketServer/src/main/resources/application-prod.yml Wyświetl plik

@@ -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:


Ładowanie…
Anuluj
Zapisz