diff --git a/src/main/java/cn/com/tenlion/aishop/pojo/dtos/goods/GoodsDTO.java b/src/main/java/cn/com/tenlion/aishop/pojo/dtos/goods/GoodsDTO.java index c419502..c155592 100644 --- a/src/main/java/cn/com/tenlion/aishop/pojo/dtos/goods/GoodsDTO.java +++ b/src/main/java/cn/com/tenlion/aishop/pojo/dtos/goods/GoodsDTO.java @@ -16,6 +16,8 @@ public class GoodsDTO { @ApiModelProperty(name = "goodsId", value = "软著商品") private String goodsId; + @ApiModelProperty(name = "userUsername", value = "软著商品") + private String userUsername; @ApiModelProperty(name = "goodsLocalPhoto", value = "软著上架图片") private String goodsLocalPhoto; @ApiModelProperty(name = "goodsFlag", value = "软著标签") @@ -81,6 +83,14 @@ public class GoodsDTO { @ApiModelProperty(name = "isDelete", value = "") private Integer isDelete; + public String getUserUsername() { + return userUsername == null ? "" : userUsername.trim(); + } + + public void setUserUsername(String userUsername) { + this.userUsername = userUsername; + } + public String getGoodsLocalPhoto() { return goodsLocalPhoto == null ? "" : goodsLocalPhoto.trim(); } diff --git a/src/main/java/cn/com/tenlion/aishop/pojo/dtos/order/OrderDTO.java b/src/main/java/cn/com/tenlion/aishop/pojo/dtos/order/OrderDTO.java index 4ce9b12..e4a7e3d 100644 --- a/src/main/java/cn/com/tenlion/aishop/pojo/dtos/order/OrderDTO.java +++ b/src/main/java/cn/com/tenlion/aishop/pojo/dtos/order/OrderDTO.java @@ -20,6 +20,8 @@ public class OrderDTO { private String orderId; @ApiModelProperty(name = "GoodsDTO", value = "软著信息") private GoodsSimpleDTO GoodsDTO; + @ApiModelProperty(name = "userUsername", value = "用户账号") + private String userUsername; @ApiModelProperty(name = "orderNumber", value = "订单编号") private String orderNumber; @ApiModelProperty(name = "buyType", value = "购买人类型个人|企业") @@ -83,6 +85,14 @@ public class OrderDTO { @ApiModelProperty(name = "correctionCount", value = "待补正数量") private Integer waitCorrectionCount; + public String getUserUsername() { + return userUsername == null ? "" : userUsername.trim(); + } + + public void setUserUsername(String userUsername) { + this.userUsername = userUsername; + } + public Integer getWaitCorrectionCount() { return waitCorrectionCount == null ? 0 : waitCorrectionCount; } diff --git a/src/main/java/cn/com/tenlion/aishop/service/goods/impl/GoodsServiceImpl.java b/src/main/java/cn/com/tenlion/aishop/service/goods/impl/GoodsServiceImpl.java index 0b25b97..0c70f78 100644 --- a/src/main/java/cn/com/tenlion/aishop/service/goods/impl/GoodsServiceImpl.java +++ b/src/main/java/cn/com/tenlion/aishop/service/goods/impl/GoodsServiceImpl.java @@ -229,7 +229,7 @@ public class GoodsServiceImpl extends DefaultBaseService implements IGoodsServic for(GoodsDTO dto : list) { OrderDTO orderDTO = iOrderService.getOrderByGoodsId(dto.getGoodsId()); if (orderDTO != null && !orderDTO.getOrderStatus().equals("0")) { - dto.setGoodsOrderStatus("1"); + dto.setGoodsOrderStatus(orderDTO.getOrderStatus()); }else{ dto.setGoodsOrderStatus("0"); } diff --git a/src/main/resources/application-lanproxy.yml b/src/main/resources/application-lanproxy.yml index 0b78566..72844ce 100644 --- a/src/main/resources/application-lanproxy.yml +++ b/src/main/resources/application-lanproxy.yml @@ -101,7 +101,7 @@ file: api-path: # user-center: http://121.36.71.250:58085/operator - user-center: http://121.36.71.250:58038/operator + user-center: http://192.168.0.15:8091/operator client-id: 290ec23667434aa289d07ff4e2491c12 client-secret: bStibC84cElYZCtNU2Zhd3dCeUpwMU5NaDZlbXhXTlFmR0pqcDhXMWZBdmxIdG9KZmEyTjJIRnI0dG1McEdEVA== operator-plugin: https://www.aimzhu.com/operator-plugin/ @@ -142,7 +142,7 @@ logging: aishop: # 账户系统地址 - account-service-path: http://121.36.71.250:58085/operator + account-service-path: http://192.168.0.15:8091/operator # 客户系统地址 copyright-service-path: http://121.36.71.250:58038/copyright # 门户系统地址 diff --git a/src/main/resources/mybatis/mapper/apporder/app-order-mapper.xml b/src/main/resources/mybatis/mapper/apporder/app-order-mapper.xml index 90a0d2a..42d403a 100644 --- a/src/main/resources/mybatis/mapper/apporder/app-order-mapper.xml +++ b/src/main/resources/mybatis/mapper/apporder/app-order-mapper.xml @@ -666,25 +666,17 @@ AND ( + t2.user_username LIKE CONCAT('%', #{keywords}, '%') + OR t1.company_name LIKE CONCAT('%', #{keywords}, '%') OR t1.app_order_no LIKE CONCAT('%', #{keywords}, '%') OR t1.app_name LIKE CONCAT('%', #{keywords}, '%') - ) - - - AND ( - - t1.company_name LIKE CONCAT('%', #{keywords}, '%') - OR - t1.app_order_no LIKE CONCAT('%', #{keywords}, '%') - OR - t1.app_name LIKE CONCAT('%', #{keywords}, '%') - OR - t1.proj_owner_name LIKE CONCAT('%', #{keywords}, '%') - OR - t1.proj_owner_identity LIKE CONCAT('%', #{keywords}, '%') + OR + t1.proj_owner_name LIKE CONCAT('%', #{keywords}, '%') + OR + t1.proj_owner_identity LIKE CONCAT('%', #{keywords}, '%') ) diff --git a/src/main/resources/mybatis/mapper/goods/goods-mapper.xml b/src/main/resources/mybatis/mapper/goods/goods-mapper.xml index e50fa4d..cdfc5cd 100644 --- a/src/main/resources/mybatis/mapper/goods/goods-mapper.xml +++ b/src/main/resources/mybatis/mapper/goods/goods-mapper.xml @@ -35,6 +35,7 @@ + @@ -455,9 +456,14 @@ t1.gmt_create, t1.modified, t1.gmt_modifir, - t1.is_delete + t1.is_delete, + t2.user_username AS user_username FROM shop_goods t1 + LEFT JOIN + user t2 + ON + t1.creator = t2.user_id WHERE t1.is_delete = 0 @@ -475,6 +481,9 @@ AND t1.goods_check_status = #{goodsCheckStatus} + + AND t1.goods_status = #{goodsStatus} + AND t1.goods_flag LIKE CONCAT('%', #{goodsFlag}, '%') @@ -492,6 +501,8 @@ AND ( + t2.user_username LIKE CONCAT('%', #{keywords}, '%') + OR t1.goods_name LIKE CONCAT('%', #{keywords}, '%') OR t1.goods_sub_name LIKE CONCAT('%', #{keywords}, '%') diff --git a/src/main/resources/mybatis/mapper/order/order-mapper.xml b/src/main/resources/mybatis/mapper/order/order-mapper.xml index ca2fb28..a33bbeb 100644 --- a/src/main/resources/mybatis/mapper/order/order-mapper.xml +++ b/src/main/resources/mybatis/mapper/order/order-mapper.xml @@ -34,6 +34,7 @@ + @@ -468,13 +469,19 @@ t1.invoice_address, t1.invoice_phone, t1.cancel_time, - t1.produce_photo + t1.produce_photo, + t1.buy_user_id, + t3.user_username AS user_username FROM shop_order t1 LEFT JOIN shop_goodsonline t2 ON t1.goods_id = t2.goods_id AND t1.goods_vnumber = t2.goods_vnumber + LEFT JOIN + user t3 + ON + t1.buy_user_id = t3.user_id WHERE 1 = 1 @@ -494,6 +501,8 @@ AND ( + t3.user_username LIKE CONCAT('%', #{keywords}, '%') + OR t1.order_number LIKE CONCAT('%', #{keywords}, '%') OR t2.goods_name LIKE CONCAT('%', #{keywords}, '%') diff --git a/src/main/resources/templates/apporder/list.html b/src/main/resources/templates/apporder/list.html index 7879627..7773103 100644 --- a/src/main/resources/templates/apporder/list.html +++ b/src/main/resources/templates/apporder/list.html @@ -97,7 +97,7 @@ [ {type:'checkbox', fixed: 'left'}, {field:'rowNum', width:80, title: '序号', fixed: 'left', align:'center', templet: '{{d.LAY_INDEX}}'}, - {field: 'appOrderId', width: 200, title: '订单号', align:'center', + {field: 'userUsername', width: 130, title: '用户账号', align:'center', templet: function(row) { var rowData = row[this.field]; if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { @@ -106,7 +106,7 @@ return rowData; } }, - {field: 'userUsername', width: 130, title: '用户账号', align:'center', + {field: 'appOrderId', width: 200, title: '订单号', align:'center', templet: function(row) { var rowData = row[this.field]; if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { diff --git a/src/main/resources/templates/correction/save.html b/src/main/resources/templates/correction/save.html index b86dfef..ab3aa34 100644 --- a/src/main/resources/templates/correction/save.html +++ b/src/main/resources/templates/correction/save.html @@ -49,7 +49,7 @@
-
+