1

pro-base/src/main/java/com/idea/customerManagement/mapper/CustomerManagementExtendMapper.java

@@ -21,4 +21,6 @@ public interface CustomerManagementExtendMapper {
 
     List<CustomerManagementDto> reportList(CustomerManagementDto record);
 
+    List<CustomerManagement> needGenerateBuyerList();
+
 }

pro-base/src/main/java/com/idea/invoice/task/InvoiceTask.java

@@ -183,7 +183,7 @@ public class InvoiceTask {
                 json.put("name", record.getBuyerName());
                 json.put("pk_custclass", "02"); //客户基本分类 ，，（默认是02），必选，01内部客户，02外部客户
                 json.put("custprop", "0");//财务组织客户类型，必选，默认0
-                json.put("taxpayerid", record.getIdentityCard()); //统一社会信用代码，必选
+                json.put("taxpayerid", record.getBuyerIdentityCard()); //统一社会信用代码，必选
                 log.info("推送客户详情:{}", json.toJSONString());
                 String result = InvoiceUtil.customerAdd(json);
                 JSONObject jsonObject = JSONObject.parseObject(result);

pro-base/src/main/java/com/idea/invoice/util/InvoiceUtil.java

@@ -155,7 +155,6 @@ public class InvoiceUtil {
         APICurUtils util = new APICurUtils();
         String token = InvoiceUtil.getToken(util);
         util.setApiUrl("nccloud/api/wxyy/uapbd/customer/add");
-        log.info("客户新增传参:{}", json);
         String result = util.getAPIRetrun(token, json.toJSONString());
         log.info("客户新增结果:{}", result);
         return result;

pro-base/src/main/java/com/idea/message/controller/MessageController.java

@@ -50,6 +50,13 @@ public class MessageController extends BaseController {
         msg.setUpdateBy(ShiroUtils.getUserId());
         msg.setUpdateName(ShiroUtils.getUser().getTruename());
         msg.setState("1");
+        // 发布
+        if(msg.getPushState().equals("0")){
+            msg.setState("0");
+            msg.setPushBy(ShiroUtils.getUserId());
+            msg.setPushTime(new Date());
+            msg.setPushName(ShiroUtils.getUser().getTruename());
+        }
         int result = sysMessageInfoService.insert(msg);
         return result(result);
     }

pro-base/src/main/resources/mybatis/customerManagement/CustomerManagementExtendMapper.xml

@@ -60,7 +60,7 @@
       select * from customer_management
       where id in (
           select customer_management_id from buyer
-        ) and ifnull(ncid,'') = ''
+        ) and ifnull(ncid,'') = '' and send_flag = '1'
     </select>
 
     <select id="getByNum" resultType="com.idea.customerManagement.model.CustomerManagement">
@@ -108,4 +108,10 @@
       </where>
       group by f.id
     </select>
+
+  <select id="needGenerateBuyerList" resultType="com.idea.customerManagement.model.CustomerManagement">
+    select * from customer_management where id not in (
+      select customer_management_id from buyer
+    )
+  </select>
 </mapper>

pro-wx/src/main/java/com/idea/pro/wx/controller/buildManage/WxParkRoomController.java

@@ -202,8 +202,8 @@ public class WxParkRoomController extends BaseController {
 //        customerManagementService.tempCusUpdate(file);
 //        customerManagementService.tempCusUpdate2(file);
 //        customerManagementService.tempContractUpdate(file);
-//        invoiceTask.sendCustomer();
-        customerManagementService.tempDepositUpdate(file);
+        invoiceTask.sendCustomer();
+//        customerManagementService.tempDepositUpdate(file);
 
         return success();
     }