Skip to content

O
order-group
Commit f47d867a by ping.wu
Options

Merge branches 'feature/20210728_购物车满赠优惠空判断_wuping' and 'qa' of… 

Merge branches 'feature/20210728_购物车满赠优惠空判断_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	call-back-service/src/main/java/cn/freemud/amp/service/OrderCallBackMQService.java
#	order-application-service/pom.xml
#	order-management/pom.xml
#	ordercenter-sdk/pom.xml
#	pom.xml
#	shopping-cart-application-service/pom.xml
parents 2848f95c 512607ee
Showing with 90 additions and 86 deletions
assortment-ordercenter-sdk/pom.xml
...@@ -10,7 +10,9 @@ ...@@ -10,7 +10,9 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>assortment-ordercenter-sdk</artifactId> <artifactId>assortment-ordercenter-sdk</artifactId>
<version>3.1.0-SNAPSHOT</version> <version>2.2-RELEASE</version>
<!-- 其他服务使用聚合订单sdk,版本号往上升级,无需提交版本号,记录好readme.md,后续看readme.md往上加版本
服务内使用无需修改版本号， 如果修改，使用到聚合订单sdk都需要统一升级-->
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
...@@ -38,7 +40,7 @@ ...@@ -38,7 +40,7 @@
<dependency> <dependency>
<groupId>cn.freemud</groupId> <groupId>cn.freemud</groupId>
<artifactId>ordercenter-sdk</artifactId> <artifactId>ordercenter-sdk</artifactId>
<version>1.3.65.RELEASE</version> <!-- 版本号在最外层pom设置,无需升级。直接打包升级聚合订单sdk -->
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.freemud.application.service.sdk</groupId> <groupId>com.freemud.application.service.sdk</groupId>
......
assortment-ordercenter-sdk/readme.md
...@@ -160,3 +160,5 @@ ...@@ -160,3 +160,5 @@
| 2.1.85-RELEASE | 小助手日结统计订单查询和售后列表查询改为从库查询 | 刘继明 | 2021-07-19| | 2.1.85-RELEASE | 小助手日结统计订单查询和售后列表查询改为从库查询 | 刘继明 | 2021-07-19|
| 3.1.0-SNAPSHOT | needInvoice/immediately字段的规范 | 王世昌 | 2021-07-14 | | 3.1.0-SNAPSHOT | needInvoice/immediately字段的规范 | 王世昌 | 2021-07-14 |
| 2.2-RELEASE | 版本升级，内部统一版本 | wuping | 2021-08-03|
\ No newline at end of file
call-back-service/src/main/java/cn/freemud/amp/service/OrderCallBackMQService.java
...@@ -23,7 +23,6 @@ import cn.freemud.entities.dto.OrderStatusChangeRequestDto; ...@@ -23,7 +23,6 @@ import cn.freemud.entities.dto.OrderStatusChangeRequestDto;
import cn.freemud.entities.dto.UserLoginInfoDto; import cn.freemud.entities.dto.UserLoginInfoDto;
import cn.freemud.entities.dto.WechatReportOrderDto; import cn.freemud.entities.dto.WechatReportOrderDto;
import cn.freemud.entities.vo.OrderCallBackRequestVo; import cn.freemud.entities.vo.OrderCallBackRequestVo;
import cn.freemud.entities.vo.OrderInfo;
import cn.freemud.redis.RedisCache; import cn.freemud.redis.RedisCache;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
...@@ -378,7 +377,7 @@ public class OrderCallBackMQService { ...@@ -378,7 +377,7 @@ public class OrderCallBackMQService {
mqService.convertAndSend(OrderCallBackConfig.TOPIC_EXCHANGE_NAME, OrderCallBackConfig.ZFB_ORDER_SEND_QUEUE_ROUTING_KEY, message); mqService.convertAndSend(OrderCallBackConfig.TOPIC_EXCHANGE_NAME, OrderCallBackConfig.ZFB_ORDER_SEND_QUEUE_ROUTING_KEY, message);
} }
}catch (Exception e){ }catch (Exception e){
logUtil.error("sendzfbOrderMQ orderCode:{} ", e,body.getOrderCode()); logUtil.error("","sendzfbOrderMQ orderCode:{} ", e,body.getOrderCode());
} }
} }
......
call-back-service/src/main/java/cn/freemud/utils/LogUtil.java
/** ///**
* All rights Reserved, Designed By www.freemud.cn // * All rights Reserved, Designed By www.freemud.cn
* // *
* @Title: LogUtil // * @Title: LogUtil
* @Package cn.freemud.utils // * @Package cn.freemud.utils
* @Description: // * @Description:
* @author: liming.guo // * @author: liming.guo
* @date: 2018/7/3 12:01 // * @date: 2018/7/3 12:01
* @version V1.0 // * @version V1.0
* @Copyright: 2018 www.freemud.cn Inc. All rights reserved. // * @Copyright: 2018 www.freemud.cn Inc. All rights reserved.
* 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目 // * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
*/ // */
package cn.freemud.utils; //package cn.freemud.utils;
//
import cn.freemud.base.ApplicationContextWare; //import cn.freemud.base.ApplicationContextWare;
import com.alibaba.fastjson.JSON; //import com.alibaba.fastjson.JSON;
import com.freemud.application.sdk.api.log.ApiLog; //import com.freemud.application.sdk.api.log.ApiLog;
import com.freemud.application.sdk.api.log.ErrorLog; //import com.freemud.application.sdk.api.log.ErrorLog;
import org.slf4j.Logger; //import org.slf4j.Logger;
import org.slf4j.LoggerFactory; //import org.slf4j.LoggerFactory;
import org.slf4j.helpers.MessageFormatter; //import org.slf4j.helpers.MessageFormatter;
import org.springframework.beans.factory.annotation.Value; //import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component; //import org.springframework.stereotype.Component;
//
@Component //@Component
public class LogUtil { //public class LogUtil {
//
@Value("${print-debug-log:false}") // @Value("${print-debug-log:false}")
private boolean printDebug; // private boolean printDebug;
//
private static Logger logger = LoggerFactory.getLogger(LogUtil.class); // private static Logger logger = LoggerFactory.getLogger(LogUtil.class);
//
private static volatile String appName = "NO_APP_NAME"; // private static volatile String appName = "NO_APP_NAME";
//
public void debug(String message, Object... params) { // public void debug(String message, Object... params) {
if (logger.isDebugEnabled()) { // if (logger.isDebugEnabled()) {
this.info(message, params); // this.info(message, params);
} // }
} // }
public void info(String message, Object... params) { // public void info(String message, Object... params) {
if (printDebug) { // if (printDebug) {
Object[] clone = params != null ? params.clone() : new String[]{}; // Object[] clone = params != null ? params.clone() : new String[]{};
String param1 = "", param2 = "", param3 = ""; // String param1 = "", param2 = "", param3 = "";
if (params.length > 0) { // if (params.length > 0) {
param1 = clone[0] instanceof String ? (String) clone[0] : JSON.toJSONString(clone[0]); // param1 = clone[0] instanceof String ? (String) clone[0] : JSON.toJSONString(clone[0]);
} // }
if (params.length > 1) { // if (params.length > 1) {
param2 = clone[1] instanceof String ? (String) clone[1] : JSON.toJSONString(clone[1]); // param2 = clone[1] instanceof String ? (String) clone[1] : JSON.toJSONString(clone[1]);
} // }
if (params.length > 2) { // if (params.length > 2) {
param3 = clone[2] instanceof String ? (String) clone[2] : JSON.toJSONString(clone[2]); // param3 = clone[2] instanceof String ? (String) clone[2] : JSON.toJSONString(clone[2]);
} // }
try { // try {
ApiLog.printLog(MessageFormatter.arrayFormat(message, params).getMessage(), param1, param2, param3); // ApiLog.printLog(MessageFormatter.arrayFormat(message, params).getMessage(), param1, param2, param3);
} catch (Exception e) { // } catch (Exception e) {
ErrorLog.errorDev("","LogUtil.printLog ".concat(message), e, params); // ErrorLog.errorDev("","LogUtil.printLog ".concat(message), e, params);
} // }
} // }
} // }
public void error(String message, Exception e, String... params) { // public void error(String message, Exception e, String... params) {
ErrorLog.errorDev("",message, e, params); // ErrorLog.errorDev("",message, e, params);
} // }
//
private static String getAppName() { // private static String getAppName() {
if (appName == null) { // if (appName == null) {
appName = ApplicationContextWare.getAppName(); // appName = ApplicationContextWare.getAppName();
if (appName == null) { // if (appName == null) {
appName = "NO_APP_NAME"; // appName = "NO_APP_NAME";
} // }
} // }
return appName; // return appName;
} // }
//
//
public void errorSe(String message, Exception e, String... params) { // public void errorSe(String message, Exception e, String... params) {
ErrorLog.errorSe(message, e, params); // ErrorLog.errorSe(message, e, params);
} // }
} //}
order-application-service/pom.xml
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
<dependency> <dependency>
<groupId>cn.freemud</groupId> <groupId>cn.freemud</groupId>
<artifactId>assortment-ordercenter-sdk</artifactId> <artifactId>assortment-ordercenter-sdk</artifactId>
<version>3.1.0-SNAPSHOT</version> <version>2.2-RELEASE</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.freemud.application.service.sdk</groupId> <groupId>com.freemud.application.service.sdk</groupId>
......
order-management/pom.xml
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
<dependency> <dependency>
<groupId>cn.freemud</groupId> <groupId>cn.freemud</groupId>
<artifactId>assortment-ordercenter-sdk</artifactId> <artifactId>assortment-ordercenter-sdk</artifactId>
<version>3.1.0-SNAPSHOT</version> <version>2.2-RELEASE</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
......
ordercenter-sdk/pom.xml
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<version>1.0.0</version> <version>1.0.0</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<version>3.1.1-SNAPSHOT</version> <!-- 版本号在最外层pom设置,无需升级。直接打包升级聚合订单sdk -->
<artifactId>ordercenter-sdk</artifactId> <artifactId>ordercenter-sdk</artifactId>
<dependencies> <dependencies>
......
pom.xml
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<lombok.version>1.16.16</lombok.version> <lombok.version>1.16.16</lombok.version>
<feign-form.version>3.0.3</feign-form.version> <feign-form.version>3.0.3</feign-form.version>
<ordercenter-sdk.version>3.1.0-SNAPSHOT</ordercenter-sdk.version> <ordercenter-sdk.version>1.0.0</ordercenter-sdk.version>
</properties> </properties>
<modules> <modules>
<module>ordercenter-sdk</module> <module>ordercenter-sdk</module>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment