Merge branch 'feature/relation_type_item' into feature/push_invoice

sp-admin/sa-view/tb-business/print-zxbusiness.html

@@ -47,7 +47,7 @@
                         </td>
                     </tr>
                     <tr height="50">
-                        <td style="border:solid #000 1px;text-align: left;" colspan="7">作业时间：
+                        <td style="border:solid #000 1px;text-align: left;" colspan="7">支付时间：
                             <span id="operateTime"></span>
                         </td>
                     </tr>
@@ -107,24 +107,12 @@
         }
 
         var id = getUrlParam('id');
-        var kaiDanPeople = '';
-        $.ajax({
-            url: sa.cfg.api_url + '/admin/getByCurr',
-            type: 'post',
-            success: function (data) {
-                var name = data.data.nickname;
-                if(name === '' || name == null) {
-                    name = data.data.name;
-                }
-                kaiDanPeople = name;
-            }
-        });
         $.ajax({
             url: sa.cfg.api_url + '/TbBusiness/getZxBusinessById?id=' + id,
             type: 'post',
             success: function (data) {
                 $("#businessNo").html(data.data.no)
-                $("#operateTime").html(data.data.operateTime);
+                $("#operateTime").html(data.data.payTime);
 
                 var carList = data.data.cars;
                 var html = [];
@@ -172,7 +160,7 @@
                 var pickCustomerName = '';
                 var itemList = data.data.items;
                 $.each(itemList, function (index, item) {
-                    pickCustomerName = pickCustomerName + item.pickCustomerName + ',';
+                    pickCustomerName = pickCustomerName + item.pickBy + ',';
                     let itemTypeName = item.itemTypeName;
                     let itemName = item.itemName;
                     let itemPrice = item.itemPrice;
@@ -198,17 +186,20 @@
                     );
                 })
                 pickCustomerName = pickCustomerName.substr(0, pickCustomerName.length-1);
-                console.log(pickCustomerName)
                 if(pickCustomerName === "null" || pickCustomerName == null){
                     pickCustomerName = '';
                 }
-                var customerName = data.data.customerName
+                var customerName = data.data.createBy;
+                var kaiDanPeople = data.data.confirmBy;
+                if(kaiDanPeople === "null" || kaiDanPeople == null){
+                    kaiDanPeople = '';
+                }
                 html.push(
                     "<tr height=\"50\">"
                     + "<td style=\"border:solid #000 1px;text-align: center;\">"+ "客户" +"</td>"
                     + "<td style=\"border:solid #000 1px;text-align: center;\">"+ customerName +"</td>"
                     + "<td style=\"border:solid #000 1px;text-align: center;\">"+ "开单员" +"</td>"
-                    + "<td style=\"border:solid #000 1px;text-align: center;\">"+ kaiDanPeople + "</td>"
+                    + "<td style=\"border:solid #000 1px;text-align: center;\">"+ kaiDanPeople +"</td>"
                     + "<td style=\"border:solid #000 1px;text-align: center;\">"+ "装卸公司" +"</td>"
                     + "<td style=\"border:solid #000 1px;text-align: center;\" colspan=\"2\">"+ pickCustomerName +"</td>"
                     + "<tr>"

sp-admin/sa-view/tb-fee-statistics/tb-fee-details-list.html

@@ -165,6 +165,7 @@
 						</template>
 					</el-table-column>
 					<sa-td name="作业编号" prop="businessItemNo" width="145px" ></sa-td>
+					<sa-td name="作业公司" prop="pickCustomerName" ></sa-td>
 					<sa-td name="客户名称" prop="customerName" ></sa-td>
 					<sa-td name="发票号" prop="invoice" width="145px"></sa-td>
 					<sa-td name="主体名称" prop="entityName" ></sa-td>

sp-admin/sa-view/tb-invoice-order/tb-invoice-order-add.html

@@ -27,7 +27,7 @@
                     <div class="c-title" v-if="id == 0">上传账单</div>
 					<div class="c-title" v-else>数据修改</div>
 					<el-form v-if="m">
-						<sa-item v-if="idShow === 1" type="text" name="交易单号" v-model="m.transactionId" br></sa-item>
+						<sa-item v-if="idShow === 1" type="text" name="交易单号" v-model="m.transactionId" placeholder="请填写账单中的交易单号" br></sa-item>
 <!--						<sa-item type="text" name="账单金额" v-model="m.billMoney" br></sa-item>-->
 						<sa-item type="img" name="账单截图" v-model="m.billImage" br></sa-item>
 						<sa-item name="" class="s-ok" br>

sp-server/src/main/java/com/pj/project/tb_business/TbBusiness.java

@@ -247,6 +247,13 @@ public class TbBusiness extends Model<TbBusiness> implements Serializable {
     private transient String itemJson;
     private transient String peopleJson;
     private transient String carJson;
+
+    /**
+     * 确认账单操作人
+     */
+    private String confirmBy;
+    private String confirmByAdminId;
+
     @TableField(exist = false)
     private List<TbBusinessItem> items = new ArrayList<>();
     @TableField(exist = false)

sp-server/src/main/java/com/pj/project/tb_business/TbBusinessService.java

@@ -341,9 +341,12 @@ public class TbBusinessService extends ServiceImpl<TbBusinessMapper, TbBusiness>
     public void confirm(List<String> ids) {
         ids.forEach(id -> {
             TbBusiness business = this.getById(id);
+            SpAdmin currAdmin = StpUserUtil.getAdmin();
+            String adminName = StrUtil.isNotEmpty(currAdmin.getNickname()) ? currAdmin.getNickname():currAdmin.getName();
             business.setConfirmInput(1).setAdminConfirmInput(1)
                     .setConfirmInputTime(new Date())
-                    .setConfirmInputBy(StpUserUtil.getAdmin().getName());
+                    .setConfirmInputBy(StpUserUtil.getAdmin().getName())
+                    .setConfirmBy(adminName).setConfirmByAdminId(currAdmin.getId()+"");
             this.updateById(business);
             List<TbBusinessCar> cars = tbBusinessCarService.findOtherBusinessCar(business.getId());
             String carNoStr = cars.stream().map(TbBusinessCar::getCarNo).collect(Collectors.joining("、"));
@@ -716,6 +719,22 @@ public class TbBusinessService extends ServiceImpl<TbBusinessMapper, TbBusiness>
                     .setItemName(db.getItemName()).setItemPrice(db.getPrice()).setRemark(tbItem.getRemark())
                     .setItemTypeId(typeId).setItemTypeName(tbItemType.getName())
                     .setUnit(db.getUnit()).setTotal(itemTotalPrice).setCreateTime(now);
+            //合作伙伴创建记录接单操作人by lzm
+            String businessType = item.getBusinessType();
+            if (!StrUtil.equals(businessType, TbCostomer.CustomerEnum.BUSINESS_TYPE.getType())) {
+                String currCustomerId = StpUserUtil.getCustomerId();
+                TbCostomer currCostomer = tbCostomerService.getById(currCustomerId);
+                List<String> customerType = new ArrayList<>();
+                if (currCostomer != null) {
+                    customerType = StrUtil.splitTrim(currCostomer.getType(), ",");
+                }
+                if (customerType.contains(businessType)) {
+                    SpAdmin currAdmin = StpUserUtil.getAdmin();
+                    String adminName = StrUtil.isNotEmpty(currAdmin.getNickname()) ? currAdmin.getNickname():currAdmin.getName();
+                    item.setPickBy(adminName).setPickByAdminId(currAdmin.getId()+"");
+                }
+            }
+            //
             price = price.add(itemTotalPrice);
             itemList.add(item);
             index++;
@@ -837,6 +856,24 @@ public class TbBusinessService extends ServiceImpl<TbBusinessMapper, TbBusiness>
                         .setItemName(db.getItemName()).setItemPrice(db.getPrice()).setRemark(tbItem.getRemark())
                         .setItemTypeId(tbItem.getTypeId()).setItemTypeName(tbItemType.getName())
                         .setUnit(db.getUnit()).setTotal(itemTotalPrice).setCreateTime(now);
+                //by lzm
+                String businessType = item.getBusinessType();
+                if (!StrUtil.equals(businessType, TbCostomer.CustomerEnum.BUSINESS_TYPE.getType())) {
+                    String currCustomerId = StpUserUtil.getCustomerId();
+                    TbCostomer currCostomer = tbCostomerService.getById(currCustomerId);
+                    List<String> customerType = new ArrayList<>();
+                    if (currCostomer != null) {
+                        customerType = StrUtil.splitTrim(currCostomer.getType(), ",");
+                    }
+                    if (customerType.contains(businessType)) {
+                        SpAdmin currAdmin = StpUserUtil.getAdmin();
+                        String adminName = StrUtil.isNotEmpty(currAdmin.getNickname()) ? currAdmin.getNickname():currAdmin.getName();
+                        item.setPickBy(adminName).setPickByAdminId(currAdmin.getId()+"");
+                    }else {
+                        item.setPickBy("").setPickByAdminId("");
+                    }
+                }
+                //
                 price = price.add(itemTotalPrice);
                 itemList.add(item);
                 index++;

sp-server/src/main/java/com/pj/project/tb_business_item/TbBusinessItem.java

@@ -113,6 +113,12 @@ public class TbBusinessItem extends Model<TbBusinessItem> implements Serializabl
 	 */
 	private Double taxRate;
 
+    /**
+     * 接单操作人
+     */
+    private String pickBy;
+    private String pickByAdminId;
+
 	@TableField(exist = false)
 	private String goodsName;
 	@TableField(exist = false)

sp-server/src/main/java/com/pj/project/tb_business_item/TbBusinessItemService.java

@@ -18,6 +18,7 @@ import com.pj.api.wx.service.WxService;
 import com.pj.constants.UserTypeEnum;
 import com.pj.current.config.MyConfig;
 import com.pj.current.config.WxConfig;
+import com.pj.current.satoken.StpUserUtil;
 import com.pj.current.task.TaskService;
 import com.pj.project.tb_business.TbBusiness;
 import com.pj.project.tb_business.TbBusinessService;
@@ -200,9 +201,12 @@ public class TbBusinessItemService extends ServiceImpl<TbBusinessItemMapper, TbB
             return AjaxJson.getError("您慢了一步，其他用户已接单");
         }
         TbCostomer tbCostomer = tbCostomerService.getById(customerId);
+        SpAdmin currAdmin = StpUserUtil.getAdmin();
+        String adminName = StrUtil.isNotEmpty(currAdmin.getNickname()) ? currAdmin.getNickname():currAdmin.getName();
         tbBusinessItem.setPick(1).setPickTime(new Date())
                 .setPickCustomerId(tbCostomer.getId())
-                .setPickCustomerName(tbCostomer.getName());
+                .setPickCustomerName(tbCostomer.getName())
+                .setPickBy(adminName).setPickByAdminId(currAdmin.getId()+"");
         this.updateById(tbBusinessItem);
         //todo 通知录入人员 已接单
         List<SpAdmin> spAdminList = spAdminService.findByCustomerId(UserTypeEnum.PLATFORM_ADMIN.getCustomerId());

sp-server/src/main/java/com/pj/project/wx_send_msg/WxMsgTask.java

@@ -21,7 +21,7 @@ public class WxMsgTask {
     /**
      * 3分钟执行一次
      */
-    //@Scheduled(fixedRate = 180000)
+    @Scheduled(fixedRate = 180000)
     public void check() {
         List<WxSendMsg> list = wxSendMsgService.list();
         list.forEach(wxSendMsg -> {