修复bug

admin-pc/.env.production

@@ -1,5 +1,5 @@
 NODE_ENV=production
-# VUE_APP_API_BASE_URL=http://localhost:8081/recycle-admin-v2/
-VUE_APP_API_BASE_URL=https://wwwv2.ddmhs.top/recycle-admin-v2/
+# VUE_APP_API_BASE_URL=http://localhost:8081/recycle-admin/
+VUE_APP_API_BASE_URL=https://www.ddmhs.top/recycle-admin/
 VUE_APP_CAS_BASE_URL=http://localhost:8888/cas
 VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview

module-common/src/main/java/org/jeecg/api/service/impl/AppletOrderServiceImpl.java

@@ -195,7 +195,7 @@ public class AppletOrderServiceImpl implements AppletOrderService {
         //得到第三级集合数据
         for (CommonOrder order1 : children) {
 
-            if(StringUtils.isNotBlank(order1.getPinId())) {
+            if(StringUtils.isNotBlank(order1.getPinId()) && StringUtils.isBlank(order1.getPinName())) {
                 CommonVip vip = commonVipService.getById(order1.getPinId());
                 if (vip != null) {
                     order1.setPinName(vip.getName());
@@ -205,7 +205,7 @@ public class AppletOrderServiceImpl implements AppletOrderService {
             }
 
             // 设置款式名称
-            if (StringUtils.isNotBlank(order1.getStyleId())) {
+            if (StringUtils.isNotBlank(order1.getStyleId()) && StringUtils.isBlank(order1.getStyleName())) {
                 CommonBrandProduct brandProduct = commonBrandProductService.getById(order1.getStyleId());
                 if (brandProduct != null) {
                     order1.setStyleName(brandProduct.getName());
@@ -320,11 +320,13 @@ public class AppletOrderServiceImpl implements AppletOrderService {
                     CommonVip vip = commonVipService.getById(sku.getPinId());
                     if (vip != null && StringUtils.isNotBlank(vip.getBrandCategory())){
                         commonBrandProductPriceService.buildBrandProductPrice(brandProduct, vip.getBrandCategory());
+                        sku.setPinName(vip.getName());
                     }
                     if (brandProduct != null) {
                         unitMinPrice = brandProduct.getMinPrice();
                         unitMaxPrice = brandProduct.getMaxPrice();
                         sku.setImage(brandProduct.getImage());
+                        sku.setStyleName(brandProduct.getName());
                         log.info("使用款式价格计算，款式ID: {}, 最低价格: {}, 最高价格: {}", 
                                 sku.getStyleId(), unitMinPrice, unitMaxPrice);
                     } else {

module-common/src/main/java/org/jeecg/api/service/impl/AppletOrderTeamServiceImpl.java

@@ -199,7 +199,7 @@ public class AppletOrderTeamServiceImpl implements AppletOrderTeamService {
 
         //得到第三级集合数据
         for (CommonOrder order1 : children) {
-            if(StringUtils.isNotBlank(order1.getPinId())){
+            if(StringUtils.isNotBlank(order1.getPinId()) && StringUtils.isBlank(order1.getPinName())){
                 CommonVip vip = commonVipService.getById(order1.getPinId());
                 if (vip != null){
                     order1.setPinName(vip.getName());
@@ -209,7 +209,7 @@ public class AppletOrderTeamServiceImpl implements AppletOrderTeamService {
             }
 
             // 设置款式名称
-            if (StringUtils.isNotBlank(order1.getStyleId())) {
+            if (StringUtils.isNotBlank(order1.getStyleId()) && StringUtils.isBlank(order1.getStyleName())) {
                 CommonBrandProduct brandProduct = commonBrandProductService.getById(order1.getStyleId());
                 if (brandProduct != null) {
                     order1.setStyleName(brandProduct.getName());
@@ -572,6 +572,7 @@ public class AppletOrderTeamServiceImpl implements AppletOrderTeamService {
                         CommonBrandProduct brandProduct = commonBrandProductService.getById(orderReq.getStyleId());
                         if (brandProduct != null) {
                             orderReq.setImage(brandProduct.getImage());
+                            orderReq.setStyleName(brandProduct.getName());
                         } else {
                             orderReq.setImage(shop.getImage());
                         }
@@ -579,6 +580,15 @@ public class AppletOrderTeamServiceImpl implements AppletOrderTeamService {
                         orderReq.setImage(shop.getImage());
                     }
 
+
+                    if (StringUtils.isNotBlank(orderReq.getPinId())) {
+                        // 查询品牌信息
+                        CommonVip vip = commonVipService.getById(orderReq.getPinId());
+                        if (vip != null) {
+                            orderReq.setPinName(vip.getName());
+                        }
+                    }
+
                     orderReq.setUnit(shop.getUnit());
                     //orderReq.setImage(shop.getImage());
                     orderReq.setTitle(shop.getName());

module-common/src/main/java/org/jeecg/modules/commonOrder/entity/CommonOrder.java

@@ -238,6 +238,10 @@ public class CommonOrder implements Serializable {
 	@ApiModelProperty(value = "级别")
 	private String qualityLevel;
 
+	/**品牌标识*/
+	private java.lang.String pinName;
+	/**款式名称*/
+	private java.lang.String styleName;
 
 
 	@TableField (exist=false)
@@ -246,12 +250,6 @@ public class CommonOrder implements Serializable {
 	@TableField (exist=false)
 	private List<CommonOrder> orderCheckList;//子订单质检
 
-	/**品牌标识*/
-    @TableField(exist = false)
-    private java.lang.String pinName;
-    /**款式名称*/
-    @TableField(exist = false)
-    private java.lang.String styleName;
     /**品牌标识*/
     @TableField(exist = false)
     private List<String> testingInstructionsText;