代码合并

fs-service/src/main/java/com/fs/hisStore/service/impl/FsStoreOrderScrmServiceImpl.java

@@ -713,8 +713,6 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
             if (param.getOrderCreateType() != null && param.getOrderCreateType() == 3 && param.getCompanyId() != null) {
                 //后台制单 判断是否需要付款
                 Company company = companyMapper.selectCompanyById(param.getCompanyId());
-                if (company != null) {
-                    if (company.getIsPay() != null && company.getIsPay() == 0) {
                 if(company!=null){
                     if (company.getIsPay() != null && company.getIsPay() == 0 && param.getIsUserApp()) {
                         //不需要付款