浏览代码

bugfix:头像问题,商户端订单详情问题。

lyx 3 月之前
父节点
当前提交
5b1d03f446

+ 1 - 1
alien-entity/src/main/java/shop/alien/mapper/LifeUserDynamicsMapper.java

@@ -19,7 +19,7 @@ public interface LifeUserDynamicsMapper extends BaseMapper<LifeUserDynamics> {
             "    from life_user_dynamics " +
             "    where delete_flag = 0 and draft = 0 order by created_time desc" +
             ") " +
-            "select dynamice.*, info.store_name userName, img.img_url userImage, info.id storeUserId, user.id storeOrUserId, 0 isExpert " +
+            "select dynamice.*, info.store_name userName, user.head_img userImage, info.id storeUserId, user.id storeOrUserId, 0 isExpert " +
             "from dynamice " +
             "join store_user user on dynamice.phone = user.phone and user.delete_flag = 0 " +
             "join store_info info on info.id = user.store_id and info.delete_flag = 0 " +

+ 1 - 1
alien-store/src/main/java/shop/alien/store/service/LifeUserOrderService.java

@@ -813,7 +813,7 @@ public class LifeUserOrderService extends ServiceImpl<LifeUserOrderMapper, LifeU
      * @return
      */
     public R<LifeUserOrderVo> queryUserOrderDetail(String orderId,String longitude, String latitude) {
-        LifeUserOrderVo lifeUserOrderVo = lifeUserOrderMapper.queryUserOrderDetail(orderId,longitude+","+latitude);
+        LifeUserOrderVo lifeUserOrderVo = lifeUserOrderMapper.queryUserOrderDetail(orderId,org.apache.commons.lang3.StringUtils.isNotBlank(longitude) && org.apache.commons.lang3.StringUtils.isNotBlank(latitude)?longitude+","+latitude:"");
         if ( null == lifeUserOrderVo){
             log.error("queryUserOrderDetail未查询到订单");
             return R.fail("未查询到订单");