修复商品下单失败

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/service/impl/PmsBrandServiceImpl.java

@@ -19,6 +19,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -52,6 +53,8 @@ public class PmsBrandServiceImpl implements PmsBrandService {
         if(i>0){
             throw new GlobalException("该品牌已存在,无法新增!");
         }
+        pmsBrand.setCreateId((long) CurrUserUtil.getUserId());
+        pmsBrand.setCreateTime(new Date());
         return brandMapper.insertSelective(pmsBrand);
     }
 
@@ -106,7 +109,7 @@ public class PmsBrandServiceImpl implements PmsBrandService {
         }
         PageHelper.startPage(pmsBrandWebFrom.getPageNum(), pmsBrandWebFrom.getPageSize());
         PmsBrandExample pmsBrandExample = new PmsBrandExample();
-        pmsBrandExample.setOrderByClause("sort desc");
+        pmsBrandExample.setOrderByClause("create_time desc,sort asc");
         PmsBrandExample.Criteria criteria = pmsBrandExample.createCriteria();
         String keyword = pmsBrandWebFrom.getKeyword();
         if (!StringUtils.isEmpty(keyword)) {

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/service/impl/UmsCompanyInfoServiceImpl.java

@@ -11,10 +11,7 @@ import com.hwrj.cloud.admin.dto.param.CompanyWebPageParam;
 import com.hwrj.cloud.admin.dto.param.SelectNewVo;
 import com.hwrj.cloud.admin.dto.param.SelectVo;
 import com.hwrj.cloud.admin.excelEntity.UmsCompanyInfoExcel;
-import com.hwrj.cloud.admin.mapper.UmsCompanyFileMapper;
-import com.hwrj.cloud.admin.mapper.UmsCompanyInfoMapper;
-import com.hwrj.cloud.admin.mapper.UmsCompanyShareMapper;
-import com.hwrj.cloud.admin.mapper.UmsCompanyShopMapper;
+import com.hwrj.cloud.admin.mapper.*;
 import com.hwrj.cloud.admin.model.*;
 import com.hwrj.cloud.admin.service.UmsCompanyService;
 import com.hwrj.cloud.admin.util.CurrUserUtil;
@@ -121,6 +118,9 @@ public class UmsCompanyInfoServiceImpl implements UmsCompanyService {
     @Autowired
     private UmsCompanyInfoDao umsCompanyInfoDao;
 
+    @Autowired
+    private UmsAdminMapper umsAdminMapper;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void delete(Long id) {
@@ -136,8 +136,15 @@ public class UmsCompanyInfoServiceImpl implements UmsCompanyService {
 
         deleteCompanyShop(id);
         deleteCompanyFile(id);
+        deleteAdmin(id);
+    }
 
-
+    private void deleteAdmin(Long id) {
+        UmsAdmin record=new UmsAdmin();
+        record.setStatus(0);
+        UmsAdminExample example=new UmsAdminExample();
+        example.createCriteria().andCompIdEqualTo(id);
+        umsAdminMapper.updateByExampleSelective(record,example);
     }
 
     private void deleteCompanyShop(Long compId){

forest-admin/admin-server/src/main/resources/dao/UmsCompanyInfoDao.xml

@@ -34,6 +34,7 @@
                         WHERE
                             1 = 1
                         AND a.comp_id = #{id}
+                        AND a.state =0
                     )
             ) tmp
     </select>