师傅端移动接口

.idea/workspace.xml

@@ -8,15 +8,28 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="26f59b4a-23ab-4f82-9dad-16520ce4a7cc" name="更改" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/shelf/_2025_10_16_8_11____.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/shelf/_2025_10_16_8_11____.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/shelf/_2025_10_9_9_16____.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/shelf/_2025_10_9_9_16____.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/TechnicianInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/TechnicianInfo.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/src/main/resources/mapper/base/TechnicianInfo.xml" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/resources/mapper/base/TechnicianInfo.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/entity/TechnicianInfo.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/entity/TechnicianInfo.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/mapper/base/TechnicianInfo.xml" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/mapper/base/TechnicianInfo.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dto/TechnicianDTO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dto/TechnicianDTO.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/Deposit.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/Deposit.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/src/main/resources/mapper/base/Deposit.xml" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/resources/mapper/base/Deposit.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/src/main/resources/mapper/base/RevenueInfo.xml" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/resources/mapper/base/RevenueInfo.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/dao/AboutUsDAO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/dao/AboutUsDAO.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/dto/TechnicianDTO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/dto/TechnicianDTO.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/entity/AboutUs.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/entity/AboutUs.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/entity/CustomerInfo.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/entity/CustomerInfo.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/entity/ReceiveRequire.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/entity/ReceiveRequire.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/AboutUsService.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/AboutUsService.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/impl/AboutUsServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/impl/AboutUsServiceImpl.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/impl/WorkOrderServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/impl/WorkOrderServiceImpl.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/mapper/base/RevenueInfo.xml" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/mapper/base/RevenueInfo.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/mobile/controller/CustomerInfoApiController.java" beforeDir="false" afterPath="$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/mobile/controller/CustomerInfoApiController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/mobile/controller/RevenueApiController.java" beforeDir="false" afterPath="$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/mobile/controller/RevenueApiController.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/mobile/controller/TechnicianApiController.java" beforeDir="false" afterPath="$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/mobile/controller/TechnicianApiController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/mobile/controller/WorkOrderApiController.java" beforeDir="false" afterPath="$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/mobile/controller/WorkOrderApiController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/web/target/classes/com/jpsoft/employment/modules/base/controller/CustomerInfoController.class" beforeDir="false" afterPath="$PROJECT_DIR$/web/target/classes/com/jpsoft/employment/modules/base/controller/CustomerInfoController.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/web/target/classes/com/jpsoft/employment/modules/mobile/controller/CustomerInfoApiController.class" beforeDir="false" afterPath="$PROJECT_DIR$/web/target/classes/com/jpsoft/employment/modules/mobile/controller/CustomerInfoApiController.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/web/target/classes/com/jpsoft/employment/modules/mobile/controller/TechnicianApiController.class" beforeDir="false" afterPath="$PROJECT_DIR$/web/target/classes/com/jpsoft/employment/modules/mobile/controller/TechnicianApiController.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/web/target/classes/com/jpsoft/employment/modules/mobile/controller/WorkOrderApiController.class" beforeDir="false" afterPath="$PROJECT_DIR$/web/target/classes/com/jpsoft/employment/modules/mobile/controller/WorkOrderApiController.class" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -473,7 +486,15 @@
       <option name="project" value="LOCAL" />
       <updated>1761264395779</updated>
     </task>
-    <option name="localTasksCounter" value="8" />
+    <task id="LOCAL-00008" summary="师傅端移动接口">
+      <option name="closed" value="true" />
+      <created>1761698117022</created>
+      <option name="number" value="00008" />
+      <option name="presentableId" value="LOCAL-00008" />
+      <option name="project" value="LOCAL" />
+      <updated>1761698117022</updated>
+    </task>
+    <option name="localTasksCounter" value="9" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
@@ -583,6 +604,17 @@
     <MESSAGE value="师傅端移动接口" />
     <option name="LAST_COMMIT_MESSAGE" value="师傅端移动接口" />
   </component>
+  <component name="XDebuggerManager">
+    <breakpoint-manager>
+      <breakpoints>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/mobile/controller/TechnicianApiController.java</url>
+          <line>512</line>
+          <option name="timeStamp" value="1" />
+        </line-breakpoint>
+      </breakpoints>
+    </breakpoint-manager>
+  </component>
   <component name="antWorkspaceConfiguration">
     <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
     <option name="FILTER_TARGETS" value="false" />

common/src/main/java/com/jpsoft/employment/modules/base/dto/TechnicianDTO.java

@@ -40,4 +40,7 @@ public class TechnicianDTO {
     @ApiModelProperty(value = "业务范围")
     private String businessScope;
 
+    @ApiModelProperty(value = "资质")
+    private String qualification;
+
 }

common/src/main/java/com/jpsoft/employment/modules/base/entity/Deposit.java

@@ -54,5 +54,8 @@ public class Deposit {
 	
 				@ApiModelProperty(value = "更新人")
 	private String updateBy;
+
+	@ApiModelProperty(value = "支付图片")
+	private String payImages;
 	
 		}

common/src/main/resources/mapper/base/Deposit.xml

@@ -15,6 +15,7 @@
 			<result property="delFlag" column="del_flag" />
 			<result property="createBy" column="create_by" />
 			<result property="updateBy" column="update_by" />
+		<result property="payImages" column="pay_images" />
 			</resultMap>
 	<insert id="insert" parameterType="com.jpsoft.employment.modules.base.entity.Deposit">
 	<!--
@@ -24,7 +25,7 @@
 	-->
 	<![CDATA[
 		insert into base_deposit
-	    (id_,amount_,technician_id,pay_type,pay_status_,pay_time,create_time,update_time,del_flag,create_by,update_by)
+	    (id_,amount_,technician_id,pay_type,pay_status_,pay_time,create_time,update_time,del_flag,create_by,update_by,pay_images)
 		values
 		(
 #{id,jdbcType=VARCHAR}
@@ -38,6 +39,7 @@
 ,#{delFlag,jdbcType= NUMERIC }
 ,#{createBy,jdbcType=VARCHAR}
 ,#{updateBy,jdbcType=VARCHAR}
+,#{payImages,jdbcType=VARCHAR}
 		)
 	]]>
 	</insert>
@@ -77,12 +79,14 @@
 				<if test="updateBy!=null">
 		update_by=#{updateBy,jdbcType=VARCHAR},
 		</if>
+			<if test="payImages!=null">
+				pay_images=#{payImages,jdbcType=VARCHAR},
+			</if>
 		</set>
 	where id_=#{id}
 	</update>
 	<select id="get" parameterType="string" resultMap="DepositMap">
-		select 
-id_,amount_,technician_id,pay_type,pay_status_,pay_time,create_time,update_time,del_flag,create_by,update_by		from base_deposit where id_=#{0}
+		select * from base_deposit where id_=#{0}
 	</select>
 	<select id="exist" parameterType="string" resultType="int">
 		select count(*) from base_deposit where id_=#{0}

common/src/main/resources/mapper/base/RevenueInfo.xml

@@ -102,7 +102,7 @@ id_,amount_,work_order_id,date_time,status_,create_time,update_time,del_flag,cre
 		SELECT SUM(amount_) FROM base_revenue_info a
 		LEFT JOIN base_work_order b ON a.work_order_id = b.id_
 		WHERE a.del_flag = FALSE
-		<if test="paid = true">
+		<if test="paid">
 		AND a.status_ = '2'
 		</if>
 		<if test="technicianId != null">

common/target/classes/mapper/base/RevenueInfo.xml

@@ -98,4 +98,15 @@ id_,amount_,work_order_id,date_time,status_,create_time,update_time,del_flag,cre
 	        ${sort.name} ${sort.order}
 	 	</foreach>
 	</select>
+	<select id="getRevenueAmount" resultType="integer">
+		SELECT SUM(amount_) FROM base_revenue_info a
+		LEFT JOIN base_work_order b ON a.work_order_id = b.id_
+		WHERE a.del_flag = FALSE
+		<if test="paid">
+		AND a.status_ = '2'
+		</if>
+		<if test="technicianId != null">
+		AND b.technician_id = #{technicianId}
+		</if>
+	</select>
 </mapper>

web/src/main/java/com/jpsoft/employment/modules/mobile/controller/CustomerInfoApiController.java

@@ -713,6 +713,7 @@ public class CustomerInfoApiController {
                 dto.setServiceInfo(technicianInfo.getServiceInfo());
                 dto.setBusinessScope(technicianInfo.getBusinessScope());
                 dto.setImage(technicianInfo.getImage());
+                dto.setQualification(technicianInfo.getQualification());
 
                 Map<String, Object> searchParams = new HashMap<>();
                 searchParams.put("technicianId", id);

web/src/main/java/com/jpsoft/employment/modules/mobile/controller/RevenueApiController.java

@@ -35,12 +35,24 @@ public class RevenueApiController {
         MessageResult<Map> msgResult = new MessageResult<>();
         Map<String,Object> map = new HashMap<>();
 
-        map.put("allAmount", revenueInfoService.getRevenueAmount(false, subject));
-        map.put("paidAmount", revenueInfoService.getRevenueAmount(true, subject));
-        map.put("rewardAmount", 0);
-
-        msgResult.setResult(true);
-        msgResult.setData(map);
+        try {
+            Integer allAmount = revenueInfoService.getRevenueAmount(false, subject);
+            if(allAmount == null)
+                allAmount = 0;
+            Integer paidAmount = revenueInfoService.getRevenueAmount(true, subject);
+            if(paidAmount == null)
+                paidAmount = 0;
+
+            map.put("allAmount", allAmount);
+            map.put("paidAmount", paidAmount);
+            map.put("rewardAmount", 0);
+
+            msgResult.setResult(true);
+            msgResult.setData(map);
+        }
+        catch (Exception ex) {
+            logger.error(ex.getMessage(),ex);
+        }
 
         return msgResult;
     }

web/src/main/java/com/jpsoft/employment/modules/mobile/controller/TechnicianApiController.java

@@ -1,7 +1,9 @@
 package com.jpsoft.employment.modules.mobile.controller;
 
+import com.jpsoft.employment.modules.base.entity.Deposit;
 import com.jpsoft.employment.modules.base.entity.Feedback;
 import com.jpsoft.employment.modules.base.entity.TechnicianInfo;
+import com.jpsoft.employment.modules.base.service.DepositService;
 import com.jpsoft.employment.modules.base.service.FeedbackService;
 import com.jpsoft.employment.modules.base.service.TechnicianInfoService;
 import com.jpsoft.employment.modules.common.dto.MessageResult;
@@ -20,6 +22,7 @@ import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 
 import javax.servlet.http.HttpSession;
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
@@ -37,6 +40,8 @@ public class TechnicianApiController {
     private TechnicianInfoService technicianInfoService;
     @Autowired
     private FeedbackService feedbackService;
+    @Autowired
+    private DepositService depositService;
 
     @ApiOperation(value="注册")
     @PostMapping("register")
@@ -265,14 +270,16 @@ public class TechnicianApiController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "region", paramType = "query", required = true, value = "服务地区"),
             @ApiImplicitParam(name = "businessScope", paramType = "query", required = true, value = "业务范围"),
+            @ApiImplicitParam(name = "serviceInfo", paramType = "query", required = true, value = "服务信息"),
     })
-    public MessageResult<Integer> checkedRegister(String region, String businessScope, @RequestAttribute String subject) {
+    public MessageResult<Integer> checkedRegister(String region, String businessScope, String serviceInfo, @RequestAttribute String subject) {
         MessageResult<Integer> msgResult = new MessageResult<>();
 
         try {
             TechnicianInfo technicianInfo = technicianInfoService.get(subject);
             technicianInfo.setRegion(region);
             technicianInfo.setBusinessScope(businessScope);
+            technicianInfo.setServiceInfo(serviceInfo);
             technicianInfo.setUpdateBy(subject);
             technicianInfo.setUpdateTime(new Date());
 
@@ -491,4 +498,47 @@ public class TechnicianApiController {
 
         return msgResult;
     }
+
+    @ApiOperation(value="服务担保")
+    @PostMapping("deposit")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "amount", paramType = "query", required = true, value = "缴纳金额"),
+            @ApiImplicitParam(name = "payType", paramType = "query", required = true, value = "支付方式"),
+            @ApiImplicitParam(name = "payImages", paramType = "query", required = true, value = "支付图片"),
+    })
+    public MessageResult<Integer> deposit(String amount, String payType, String payImages, @RequestAttribute String subject) {
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            Deposit deposit = new Deposit();
+            deposit.setId(UUID.randomUUID().toString());
+            deposit.setAmount(new BigDecimal(amount));
+            deposit.setPayType(payType);
+            deposit.setPayStatus("1");
+            deposit.setPayTime(new Date());
+            deposit.setPayImages(payImages);
+            deposit.setTechnicianId(subject);
+            deposit.setDelFlag(false);
+            deposit.setCreateBy(subject);
+            deposit.setCreateTime(new Date());
+
+            int affectCount = depositService.insert(deposit);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setMessage("提交成功！");
+                msgResult.setData(affectCount);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("提交失败！");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
 }