bug单相关修改

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/impl/ContactsServiceImpl.java

@@ -596,12 +596,16 @@ public class ContactsServiceImpl extends ServiceImpl<ContactsMapper, Contacts> i
                             }
                         }
                     }else if(modelName.equals("sex")){
-                        if(!StringUtils.isEmpty(cell.getStringCellValue())){
-                            String stringCellValue = cell.getStringCellValue();
-                            if (stringCellValue.equals("男")){
-                                contacts.setSex(1);
-                            } else if (stringCellValue.equals("女")) {
-                                contacts.setSex(0);
+                        if(null == cell){
+                            contacts.setSex(null);
+                        }else{
+                            if(!StringUtils.isEmpty(cell.getStringCellValue())){
+                                String stringCellValue = cell.getStringCellValue();
+                                if (stringCellValue.equals("男")){
+                                    contacts.setSex(1);
+                                } else if (stringCellValue.equals("女")) {
+                                    contacts.setSex(0);
+                                }
                             }
                         }
                     }

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/impl/CustomServiceImpl.java

@@ -691,7 +691,7 @@ public class CustomServiceImpl extends ServiceImpl<CustomMapper, Custom> impleme
         Integer companyId = user.getCompanyId();
         WxCorpInfo wxCorpInfo = wxCorpInfoService.getOne(new LambdaQueryWrapper<WxCorpInfo>().eq(WxCorpInfo::getCompanyId, companyId));
         List<User> userList = userMapper.selectList(new LambdaQueryWrapper<User>().eq(User::getCompanyId, companyId));
-        List<SysDict> sysSources = sysDictMapper.selectList(new LambdaQueryWrapper<SysDict>().eq(SysDict::getCompanyId, companyId).eq(SysDict::getCode, "ClueSources"));
+        List<SysDict> sysSources = sysDictMapper.selectList(new LambdaQueryWrapper<SysDict>().eq(SysDict::getCompanyId, companyId).eq(SysDict::getCode, "CustomSources"));
         List<SysDict> sysIndutryId = sysDictMapper.selectList(new LambdaQueryWrapper<SysDict>().eq(SysDict::getCompanyId, companyId).eq(SysDict::getCode, "CustomIndustry"));
         List<SysDict> levels = sysDictMapper.selectList(new LambdaQueryWrapper<SysDict>().eq(SysDict::getCompanyId, companyId).eq(SysDict::getCode, "CustomLevel"));
 
@@ -843,7 +843,7 @@ public class CustomServiceImpl extends ServiceImpl<CustomMapper, Custom> impleme
                             if(first.isPresent()){
                                 product.setCustomSourceId(first.get().getId());
                             }else {
-                                msg.setError("线索来源["+cell.getStringCellValue()+"]不存在，请在系统字典中增加");
+                                msg.setError("客户来源["+cell.getStringCellValue()+"]不存在，请在系统字典中增加");
                                 return msg;
                             }
                         }

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/impl/SalesOrderServiceImpl.java

@@ -838,6 +838,22 @@ public class SalesOrderServiceImpl extends ServiceImpl<SalesOrderMapper, SalesOr
                             method.invoke(order,cell.getStringCellValue());
                         }
                     }
+                    if(null != order.getPrice() && null != order.getReceivedPayment()){
+                        //计算金额 - 已回款 是否等于 金额
+                        BigDecimal price = order.getPrice();
+                        BigDecimal receivedPayment = order.getReceivedPayment();
+                        order.setUnReceivedPayment(price.subtract(receivedPayment));
+                        if(receivedPayment.compareTo(new BigDecimal(0))>0){
+                            //存在已回款金额
+                            if(price.subtract(receivedPayment).compareTo(new BigDecimal(0)) > 0){
+                                order.setReceivedStatus(1);
+                            }else if (price.subtract(receivedPayment).compareTo(new BigDecimal(0)) == 0){
+                                order.setReceivedStatus(2);
+                            }
+                        }else{
+                            order.setReceivedStatus(0);
+                        }
+                    }
                 }
                 importOrderList.add(order);
             }