ufo / yohoufo-fore · Commits

Go to a project

Authored by tanling
Commit a2a9d7bb67fb6fa0b90c9d3ecd135385d44df694 2 parents 111f762f 8d56031b

Merge branch 'test6.8.4' of http://git.yoho.cn/ufo/yohoufo-fore into test6.8.4

Inline Side-by-side
Showing 4 changed files with 7 additions and 6 deletions
... ... @@ -111,7 +111,7 @@ public class PaymentController {
* 退款结果确认
* @return
*/
@RequestMapping(params = "method=ufo.order.refund")
@RequestMapping(params = "/erp/order/refund")
public ApiResponse refund(@RequestParam(name = "orderCode") long orderCode,
@RequestParam(name = "refundAmount") double refundAmount){
... ...
... ... @@ -45,7 +45,7 @@ public class ProductIdentifyController {
ProductIdentifyResp info = identifyService.queryIdentifyInfo(tagId, nfcUid);
return new ApiResponse.ApiResponseBuilder().code(200).data(info).build();
}catch (Exception e){
logger.warn("queryIdentifyInfo error! tagId={}, nfcUid={}, ", tagId, nfcUid);
logger.warn("queryIdentifyInfo error! tagId={}, nfcUid={}, e is {}", tagId, nfcUid, e);
if( e instanceof GatewayException){
throw e;
}
... ...
... ... @@ -158,7 +158,7 @@ public class ProductIdentifyServiceImpl implements ProductIdentifyService{
identifyTrack.setTimeStr(formatDate(authTime, "yyyy.MM.dd HH:mm:ss"));
identifyTrack.setContent( authGroup + "鉴定结果为\"真\"");
//鉴定中心，默认的展示头像
String auth_inco = configReader.getString("ufo.product.defaultAuthHeadIcon", "http://head.static.yhbimg.com/yhb-head/2018/12/24/10/01187dd372e153ea9c062cd0604cd169b2.jpg?imageView2/{mode}/w/{width}/h/{height}");
String auth_inco = configReader.getString("ufo.product.defaultAuthHeadIcon", "http://head.static.yhbimg.com/yhb-head/2018/12/28/14/01384244a3ca86fa5345df87c59317b81f.png?imageView2/{mode}/w/{width}/h/{height}");
identifyTrack.setHeadIcon(auth_inco);
trackRespList.add(identifyTrack);
... ... @@ -175,7 +175,7 @@ public class ProductIdentifyServiceImpl implements ProductIdentifyService{
String headIcon = buyerInfo.getHeadIco();
if(DEFAULT_HEAD_IMG.equals(headIcon) || StringUtils.isBlank(headIcon)){//有货的默认头像
//ufo 用户的默认头像
headIcon = configReader.getString("ufo.product.defaultUserHeadIcon", "http://head.static.yhbimg.com/yhb-head/2018/12/27/15/01e4d5f0761cab78186e709ba910f1930d.jpg?imageView2/{mode}/w/{width}/h/{height}");
headIcon = configReader.getString("ufo.product.defaultUserHeadIcon", "http://head.static.yhbimg.com/yhb-head/2018/12/28/14/0160773bb87685aade796ea4f94e0587cf.png?imageView2/{mode}/w/{width}/h/{height}");
}
//2）订单完成
if(orderStatus != null && orderStatus.intValue() == 5){//订单已完成
... ...
#UFO鉴定中心默认头像
ufo.product.defaultAuthHeadIcon=http://head.static.yhbimg.com/yhb-head/2018/12/24/10/01187dd372e153ea9c062cd0604cd169b2.jpg?imageView2/{mode}/w/{width}/h/{height}
ufo.product.defaultAuthHeadIcon=http://head.static.yhbimg.com/yhb-head/2018/12/28/14/01384244a3ca86fa5345df87c59317b81f.png?imageView2/{mode}/w/{width}/h/{height}
#UFO用户的默认头像
ufo.product.defaultUserHeadIcon=http://head.static.yhbimg.com/yhb-head/2018/12/27/15/01e4d5f0761cab78186e709ba910f1930d.jpg?imageView2/{mode}/w/{width}/h/{height}
\ No newline at end of file
ufo.product.defaultUserHeadIcon=http://head.static.yhbimg.com/yhb-head/2018/12/28/14/0160773bb87685aade796ea4f94e0587cf.png?imageView2/{mode}/w/{width}/h/{height}
... ...