Browse Source

Merge branch 'test' of jishutao/kede-server into prod

anderx 4 years ago
parent
commit
6da53dc5cb

+ 1 - 1
src/main/java/com/goafanti/common/controller/PublicController.java

@@ -83,7 +83,7 @@ public class PublicController extends CertifyApiController {
 	@Value(value = "${mobileRemindCodeTemplate}")
 	private String					mobileRemindCodeTemplate	= null;
 	@Value(value = "${wx.clockInRange}")
-	private String clockInRange;
+	private Integer clockInRange;
 
 	@Resource
 	private UserService				userService;

+ 6 - 11
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

@@ -1579,7 +1579,7 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
   </select>
   
   <select id="getOrderNewDetail" parameterType="java.lang.String" resultType="com.goafanti.order.bo.TOrderNewBo">
-  select 
+  	 select 
     a.order_no as orderNo, a.order_type as orderType, a.creater, a.create_time as createTime,a.update_time as updateTime, a.buyer_id as buyerId,
     a.first_amount as firstAmount,a.total_amount as totalAmount, a.settlement_amount as settlementAmount, order_status as orderStatus,
     a.liquidation_status as liquidationStatus, a.process_status as processStatus, a.project_status as projectStatus, a.approval,
@@ -1587,20 +1587,15 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
     a.sign_time as signTime, a.settlement_time as settlementTime, a.contract_no as contractNo, a.contract_type as contractType, a.contacts,
     a.contact_mobile as contactMobile, a.legal_person as legalPerson, a.legal_person_tel as legalPersonTel, a.proof_count as proofCount,
     a.proof_aid as proofAid,contract_picture_url as contractPictureUrl, c.name as salesmanName,dep.name as depName,d.name as financeName,
-    c.contact_mobile as salesmanMobile,d.contact_mobile as financeMobile,b.nickname as userName ,e.back_status as backStatus,f.name as initiateName,
+    c.contact_mobile as salesmanMobile,d.contact_mobile as financeMobile,b.username as userName ,e.back_status as backStatus,f.name as initiateName,
     e.reason,date_format(e.create_time,'%Y-%m-%d') as backDate,a.buyer_id as uid,a.order_dep as orderDep, g.location_province as locationProvince,
     g.location_city as locationCity,g.location_area locationArea,g.postal_address postalAddress,outsource,a.primary_order primaryOrder,a.agreement_url agreementUrl,
     h.name NowFinance,h.contact_mobile NowFinanceMobile,a.additional_order additionalOrder,i.name as oldSalesmanName, i.contact_mobile oldSalesmanMobile
-    from t_order_new a 
-    left join `user` b on a.buyer_id=b.id 
-    left join admin i on a.old_salesman_id=i.id
-    left join admin c on a.salesman_id=c.id 
-    left join department dep on a.order_dep=dep.id 
-    left join admin d on a.finance_id=d.id
-    left join admin h on dep.finance_id=h.id 
+    from t_order_new a left join `user` b on a.buyer_id=b.id left join admin i on a.old_salesman_id=i.id
+    left join admin c on a.salesman_id=c.id left join department dep on a.order_dep=dep.id 
+    left join admin d on a.finance_id=d.id left join admin h on dep.finance_id=h.id 
     left join (select * from t_order_back a where back_status=0) e on a.order_no=e.order_no
-  	left join admin f on e.initiate=f.id 
-  	left join organization_identity g on a.buyer_id=g.uid
+  	left join admin f on e.initiate=f.id left join organization_identity g on a.buyer_id=g.uid
     where a.order_no = #{orderNo,jdbcType=VARCHAR}
   </select>
   

+ 6 - 4
src/main/java/com/goafanti/common/mapper/TemporaryReceivablesMapper.xml

@@ -387,10 +387,12 @@
     where aid = #{aid,jdbcType=INTEGER}
   </select>
   <select id="selectReceivablesList" parameterType="java.lang.String" resultType="com.goafanti.order.bo.ReceivablesListBo">
-  	select a.id,a.order_no orderNo,b.contract_no contractNo,a.corporate_name corporateName,c.nickname,b.total_amount totalAmount,d.name depName,a.status ,b.settlement_amount settlementAmount,
-	a.financial_pay_no financialPayNo,a.amount,date_format(a.receivables_time, '%Y-%m-%d')receivablesTimes,date_format(a.create_time, '%Y-%m-%d %H:%i:%S')createTimes,a.remarks
-	from temporary_receivables a left join t_order_new b on a.order_no=b.order_no left join user c on b.buyer_id=c.id left join department d on b.order_dep=d.id
-	left join admin e on b.salesman_id=e.id 
+  	 select a.id,a.order_no orderNo,b.contract_no contractNo,a.corporate_name corporateName,c.nickname,
+    b.total_amount totalAmount,d.name depName,a.status ,b.settlement_amount settlementAmount,
+	a.financial_pay_no financialPayNo,a.amount,date_format(a.receivables_time, '%Y-%m-%d')receivablesTimes,
+	date_format(a.create_time, '%Y-%m-%d %H:%i:%S')createTimes,a.remarks,c.username
+	from temporary_receivables a left join t_order_new b on a.order_no=b.order_no left join user c on b.buyer_id=c.id 
+	left join department d on b.order_dep=d.id left join admin e on b.salesman_id=e.id 
 	where 1=1
 	<if test="aid != null">
 	and  a.aid= #{aid}

+ 7 - 0
src/main/java/com/goafanti/order/bo/ReceivablesListBo.java

@@ -8,6 +8,7 @@ public class ReceivablesListBo {
 	private String contractNo;
 	private String corporateName;
 	private String nickname;
+	private String username;
 	private BigDecimal totalAmount;
 	private BigDecimal settlementAmount;
 	private String depName;
@@ -108,6 +109,12 @@ public class ReceivablesListBo {
 	public void setInptStatus(Integer inptStatus) {
 		this.inptStatus = inptStatus;
 	}
+	public String getUsername() {
+		return username;
+	}
+	public void setUsername(String username) {
+		this.username = username;
+	}
 	
 	
 

+ 1 - 1
src/main/java/com/goafanti/order/service/impl/OrderReceivablesServiceImpl.java

@@ -301,7 +301,7 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
 				r.setInptStatus(1);
 			}else if(r.getTotalAmount()==null) {
 				r.setInptStatus(2);
-			}else if(!r.getCorporateName().equals(r.getNickname())) {
+			}else if(!r.getCorporateName().equals(r.getUsername())) {
 				r.setInptStatus(3);
 			}else {
 				r.setInptStatus(0);