Submit by Strive

Date 2021/03/24
检测结果静态页面修改
Project End

aidea-modules/consult-module/src/main/java/com/cftech/consultsheet/web/ConsultSheetController.java

@@ -486,14 +486,11 @@ public class ConsultSheetController {
                     order.setAccountsId(accountId);
                     order.setStatus("0");//添加订单待确认
                     order.setDescription(goodsDes);
+                    order.setAddressId(StringUtils.isNoneBlank(consultSheet.getAddressId()) ? Long.parseLong(consultSheet.getAddressId()) : null);
 
                     if (StringUtils.isNoneBlank(consultSheet.getAddressId())) {
-                        Conds adsConds = new Conds();
-                        adsConds.equal("t.del_flag", Constants.DEL_FLAG_0);
-                        adsConds.equal("t.id", consultSheet.getAddressId());
-                        Address address = addressService.fetchSearchByConds(adsConds);
+                        Address address = addressService.fetchById(consultSheet.getAddressId());
                         if (address != null) {
-                            order.setAddressId(address.getId());
                             order.setAddressDes(address.getProvinceName()+address.getCityName()+address.getCountyName()+address.getAddressName());
                         }
                     }
@@ -507,7 +504,6 @@ public class ConsultSheetController {
                         MpFanssEntity mpFanssEntity = mpFanssService.fetchSearchByConds(conds);
                         if (mpFanssEntity != null && StringUtils.isBlank(mpFanssEntity.getStore())) {
                             mpFanssEntity.setStore(fansAlias);
-
                             mpFanssService.updateByOpenId(mpFanssEntity);
                         }
 

membercard-modules/shipping-address-module/src/main/java/com/cftech/addresst/dao/AddressMapper.xml

@@ -201,7 +201,7 @@
         INNER JOIN area a ON t.province_id = a.areaid
         INNER JOIN area b ON t.city_id = b.areaid
         INNER JOIN area c ON t.area_id = c.areaid
-        INNER JOIN t_order o ON o.openid = t.open_id
+        LEFT JOIN t_order o ON o.openid = t.open_id
         <include refid="sqlWhere"/>
         GROUP BY  t.id) tmp
     </select>
@@ -213,7 +213,7 @@
         INNER JOIN area a ON t.province_id = a.areaid
         INNER JOIN area b ON t.city_id = b.areaid
         INNER JOIN area c ON t.area_id = c.areaid
-        INNER JOIN t_order o ON o.openid = t.open_id
+        LEFT JOIN t_order o ON o.openid = t.open_id
         <include refid="sqlWhere"/>
         GROUP BY  t.id
         <if test="sort!=null">ORDER BY ${sort.param} ${sort.type}</if>